Commit 21af1094 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ac97',... 

Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ac97', 'asoc/topic/ak4542', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next
parents 28becbd5 93ec3a1a 310398f5 f8ea6ceb d90c6cc2 56113f6e

include/sound/ac97_codec.h

+2 −0
Original line number Diff line number Diff line
@@ -584,6 +584,8 @@ static inline int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, 
void snd_ac97_suspend(struct snd_ac97 *ac97);

void snd_ac97_resume(struct snd_ac97 *ac97);

#endif

int snd_ac97_reset(struct snd_ac97 *ac97, bool try_warm, unsigned int id,

	unsigned int id_mask);



/* quirk types */

enum {

include/sound/soc.h

+2 −1
Original line number Diff line number Diff line
@@ -526,7 +526,8 @@ int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg, 


#ifdef CONFIG_SND_SOC_AC97_BUS

struct snd_ac97 *snd_soc_alloc_ac97_codec(struct snd_soc_codec *codec);

struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec);

struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec,

	unsigned int id, unsigned int id_mask);

void snd_soc_free_ac97_codec(struct snd_ac97 *ac97);



int snd_soc_set_ac97_ops(struct snd_ac97_bus_ops *ops);

sound/ac97_bus.c

+62 −0
Original line number Diff line number Diff line
@@ -17,6 +17,68 @@ 
#include <linux/string.h>

#include <sound/ac97_codec.h>



/*

 * snd_ac97_check_id() - Reads and checks the vendor ID of the device

 * @ac97: The AC97 device to check

 * @id: The ID to compare to

 * @id_mask: Mask that is applied to the device ID before comparing to @id

 *

 * If @id is 0 this function returns true if the read device vendor ID is

 * a valid ID. If @id is non 0 this functions returns true if @id

 * matches the read vendor ID. Otherwise the function returns false.

 */

static bool snd_ac97_check_id(struct snd_ac97 *ac97, unsigned int id,

	unsigned int id_mask)

{

	ac97->id = ac97->bus->ops->read(ac97, AC97_VENDOR_ID1) << 16;

	ac97->id |= ac97->bus->ops->read(ac97, AC97_VENDOR_ID2);



	if (ac97->id == 0x0 || ac97->id == 0xffffffff)

		return false;



	if (id != 0 && id != (ac97->id & id_mask))

		return false;



	return true;

}



/**

 * snd_ac97_reset() - Reset AC'97 device

 * @ac97: The AC'97 device to reset

 * @try_warm: Try a warm reset first

 * @id: Expected device vendor ID

 * @id_mask: Mask that is applied to the device ID before comparing to @id

 *

 * This function resets the AC'97 device. If @try_warm is true the function

 * first performs a warm reset. If the warm reset is successful the function

 * returns 1. Otherwise or if @try_warm is false the function issues cold reset

 * followed by a warm reset. If this is successful the function returns 0,

 * otherwise a negative error code. If @id is 0 any valid device ID will be

 * accepted, otherwise only the ID that matches @id and @id_mask is accepted.

 */

int snd_ac97_reset(struct snd_ac97 *ac97, bool try_warm, unsigned int id,

	unsigned int id_mask)

{

	struct snd_ac97_bus_ops *ops = ac97->bus->ops;



	if (try_warm && ops->warm_reset) {

		ops->warm_reset(ac97);

		if (snd_ac97_check_id(ac97, id, id_mask))

			return 1;

	}



	if (ops->reset)

		ops->reset(ac97);

	if (ops->warm_reset)

		ops->warm_reset(ac97);



	if (snd_ac97_check_id(ac97, id, id_mask))

		return 0;



	return -ENODEV;

}

EXPORT_SYMBOL_GPL(snd_ac97_reset);



/*

 * Let drivers decide whether they want to support given codec from their

 * probe method. Drivers have direct access to the struct snd_ac97

sound/soc/atmel/atmel_ssc_dai.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, 
	int dir, dir_mask;

	int ret;



	pr_debug("atmel_ssc_startup: SSC_SR=0x%u\n",

	pr_debug("atmel_ssc_startup: SSC_SR=0x%x\n",

		ssc_readl(ssc_p->ssc->regs, SR));



	/* Enable PMC peripheral clock for this SSC */

sound/soc/codecs/88pm860x-codec.c

+1 −3
Original line number Diff line number Diff line
@@ -1028,10 +1028,8 @@ static int pm860x_set_dai_sysclk(struct snd_soc_dai *codec_dai, 


	if (dir == PM860X_CLK_DIR_OUT)

		pm860x->dir = PM860X_CLK_DIR_OUT;

	else {

		pm860x->dir = PM860X_CLK_DIR_IN;

	else	/* Slave mode is not supported */

		return -EINVAL;

	}



	return 0;

}