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

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

Merge branch 'fix/misc' into topic/misc

parents a09452ee fc084e0b

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ STAC92HD83* 
  ref		Reference board

  mic-ref	Reference board with power management for ports

  dell-s14	Dell laptop

  dell-vostro-3500	Dell Vostro 3500 laptop

  hp		HP laptops with (inverted) mute-LED

  hp-dv7-4000	HP dv-7 4000

  auto		BIOS setup (default)

Documentation/sound/alsa/HD-Audio.txt

+4 −4
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ Development Tree 
~~~~~~~~~~~~~~~~

The latest development codes for HD-audio are found on sound git tree:



- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git

- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git



The master branch or for-next branches can be used as the main

development branches in general while the HD-audio specific patches
@@ -594,7 +594,7 @@ is, installed via the usual spells: configure, make and make 
install(-modules).  See INSTALL in the package.  The snapshot tarballs

are found at:



- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/

- ftp://ftp.suse.com/pub/people/tiwai/snapshot/





Sending a Bug Report
@@ -696,7 +696,7 @@ via hda-verb won't change the mixer value. 


The hda-verb program is found in the ftp directory:



- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/

- ftp://ftp.suse.com/pub/people/tiwai/misc/



Also a git repository is available:
@@ -764,7 +764,7 @@ operation, the jack plugging simulation, etc. 


The package is found in:



- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/

- ftp://ftp.suse.com/pub/people/tiwai/misc/



A git repository is available:

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -5648,7 +5648,6 @@ F: drivers/media/video/*7146* 
F:	include/media/*7146*



SAMSUNG AUDIO (ASoC) DRIVERS

M:	Jassi Brar <jassisinghbrar@gmail.com>

M:	Sangbeom Kim <sbkim73@samsung.com>

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

S:	Supported
@@ -6122,7 +6121,7 @@ F: sound/ 
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

M:	Liam Girdwood <lrg@ti.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

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

W:	http://alsa-project.org/main/index.php/ASoC

S:	Supported

drivers/firmware/sigma.c

+58 −23
Original line number Diff line number Diff line
@@ -14,13 +14,34 @@ 
#include <linux/module.h>

#include <linux/sigma.h>



/* Return: 0==OK, <0==error, =1 ==no more actions */

static size_t sigma_action_size(struct sigma_action *sa)

{

	size_t payload = 0;



	switch (sa->instr) {

	case SIGMA_ACTION_WRITEXBYTES:

	case SIGMA_ACTION_WRITESINGLE:

	case SIGMA_ACTION_WRITESAFELOAD:

		payload = sigma_action_len(sa);

		break;

	default:

		break;

	}



	payload = ALIGN(payload, 2);



	return payload + sizeof(struct sigma_action);

}



/*

 * Returns a negative error value in case of an error, 0 if processing of

 * the firmware should be stopped after this action, 1 otherwise.

 */

static int

process_sigma_action(struct i2c_client *client, struct sigma_firmware *ssfw)

process_sigma_action(struct i2c_client *client, struct sigma_action *sa)

{

	struct sigma_action *sa = (void *)(ssfw->fw->data + ssfw->pos);

	size_t len = sigma_action_len(sa);

	int ret = 0;

	int ret;



	pr_debug("%s: instr:%i addr:%#x len:%zu\n", __func__,

		sa->instr, sa->addr, len);
@@ -29,44 +50,50 @@ process_sigma_action(struct i2c_client *client, struct sigma_firmware *ssfw) 
	case SIGMA_ACTION_WRITEXBYTES:

	case SIGMA_ACTION_WRITESINGLE:

	case SIGMA_ACTION_WRITESAFELOAD:

		if (ssfw->fw->size < ssfw->pos + len)

			return -EINVAL;

		ret = i2c_master_send(client, (void *)&sa->addr, len);

		if (ret < 0)

			return -EINVAL;

		break;



	case SIGMA_ACTION_DELAY:

		ret = 0;

		udelay(len);

		len = 0;

		break;



	case SIGMA_ACTION_END:

		return 1;



		return 0;

	default:

		return -EINVAL;

	}



	/* when arrive here ret=0 or sent data */

	ssfw->pos += sigma_action_size(sa, len);

	return ssfw->pos == ssfw->fw->size;

	return 1;

}



static int

process_sigma_actions(struct i2c_client *client, struct sigma_firmware *ssfw)

{

	pr_debug("%s: processing %p\n", __func__, ssfw);

	struct sigma_action *sa;

	size_t size;

	int ret;



	while (ssfw->pos + sizeof(*sa) <= ssfw->fw->size) {

		sa = (struct sigma_action *)(ssfw->fw->data + ssfw->pos);



		size = sigma_action_size(sa);

		ssfw->pos += size;

		if (ssfw->pos > ssfw->fw->size || size == 0)

			break;



		ret = process_sigma_action(client, sa);



	while (1) {

		int ret = process_sigma_action(client, ssfw);

		pr_debug("%s: action returned %i\n", __func__, ret);

		if (ret == 1)

			return 0;

		else if (ret)



		if (ret <= 0)

			return ret;

	}



	if (ssfw->pos != ssfw->fw->size)

		return -EINVAL;



	return 0;

}



int process_sigma_firmware(struct i2c_client *client, const char *name)
@@ -89,16 +116,24 @@ int process_sigma_firmware(struct i2c_client *client, const char *name) 


	/* then verify the header */

	ret = -EINVAL;

	if (fw->size < sizeof(*ssfw_head))



	/*

	 * Reject too small or unreasonable large files. The upper limit has been

	 * chosen a bit arbitrarily, but it should be enough for all practical

	 * purposes and having the limit makes it easier to avoid integer

	 * overflows later in the loading process.

	 */

	if (fw->size < sizeof(*ssfw_head) || fw->size >= 0x4000000)

		goto done;



	ssfw_head = (void *)fw->data;

	if (memcmp(ssfw_head->magic, SIGMA_MAGIC, ARRAY_SIZE(ssfw_head->magic)))

		goto done;



	crc = crc32(0, fw->data, fw->size);

	crc = crc32(0, fw->data + sizeof(*ssfw_head),

			fw->size - sizeof(*ssfw_head));

	pr_debug("%s: crc=%x\n", __func__, crc);

	if (crc != ssfw_head->crc)

	if (crc != le32_to_cpu(ssfw_head->crc))

		goto done;



	ssfw.pos = sizeof(*ssfw_head);

include/linux/mfd/wm8994/registers.h

+15 −0
Original line number Diff line number Diff line
@@ -1962,6 +1962,21 @@ 
#define WM8958_MICB2_DISCH_SHIFT                     0  /* MICB2_DISCH */

#define WM8958_MICB2_DISCH_WIDTH                     1  /* MICB2_DISCH */



/*

 * R210 (0xD2) - Mic Detect 3

 */

#define WM8958_MICD_LVL_MASK                    0x07FC  /* MICD_LVL - [10:2] */

#define WM8958_MICD_LVL_SHIFT                        2  /* MICD_LVL - [10:2] */

#define WM8958_MICD_LVL_WIDTH                        9  /* MICD_LVL - [10:2] */

#define WM8958_MICD_VALID                       0x0002  /* MICD_VALID */

#define WM8958_MICD_VALID_MASK                  0x0002  /* MICD_VALID */

#define WM8958_MICD_VALID_SHIFT                      1  /* MICD_VALID */

#define WM8958_MICD_VALID_WIDTH                      1  /* MICD_VALID */

#define WM8958_MICD_STS                         0x0001  /* MICD_STS */

#define WM8958_MICD_STS_MASK                    0x0001  /* MICD_STS */

#define WM8958_MICD_STS_SHIFT                        0  /* MICD_STS */

#define WM8958_MICD_STS_WIDTH                        1  /* MICD_STS */



/*

 * R76 (0x4C) - Charge Pump (1)

 */