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

Commit 09e337bd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm_sdw: Set codec directory name at runtime"

parents 0a61748f a7f90db9

drivers/pinctrl/qcom/pinctrl-lpi.c

+21 −21
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "../core.h"

#include "../pinctrl-utils.h"



#define LPI_ADDRESS_SIZE			0xC000

#define LPI_ADDRESS_SIZE			0x20000



#define LPI_GPIO_REG_VAL_CTL			0x00

#define LPI_GPIO_REG_DIR_CTL			0x04
@@ -109,35 +109,35 @@ static const u32 lpi_offset[] = { 
	0x00000000,

	0x00001000,

	0x00002000,

	0x00002010,

	0x00003000,

	0x00003010,

	0x00004000,

	0x00004010,

	0x00005000,

	0x00005010,

	0x00005020,

	0x00005030,

	0x00006000,

	0x00006010,

	0x00007000,

	0x00007010,

	0x00005040,

	0x00005050,

	0x00008000,

	0x00008010,

	0x00008020,

	0x00008030,

	0x00008040,

	0x00008050,

	0x00008060,

	0x00008070,

	0x00009000,

	0x00009010,

	0x0000A000,

	0x0000A010,

	0x0000B000,

	0x0000B010,

	0x0000C000,

	0x0000D000,

	0x0000E000,

	0x0000F000,

	0x00010000,

	0x00011000,

	0x00012000,

	0x00013000,

	0x00014000,

	0x00015000,

	0x00016000,

	0x00017000,

	0x00018000,

	0x00019000,

	0x0001A000,

	0x0001B000,

	0x0001C000,

	0x0001D000,

	0x0001E000,

	0x0001F000,

};



static const char *const lpi_gpio_functions[] = {

sound/soc/codecs/msm_sdw/msm_sdw_cdc.c

+6 −2
Original line number Diff line number Diff line
@@ -1376,14 +1376,18 @@ int msm_sdw_codec_info_create_codec_entry(struct snd_info_entry *codec_root, 
	struct snd_info_entry *version_entry;

	struct msm_sdw_priv *msm_sdw;

	struct snd_soc_card *card;

	char name[80];



	if (!codec_root || !codec)

		return -EINVAL;



	msm_sdw = snd_soc_codec_get_drvdata(codec);

	card = codec->component.card;



	snprintf(name, sizeof(name), "%x.%s", (u32)msm_sdw->sdw_base_addr,

			"msm-sdw-codec");

	msm_sdw->entry = snd_info_create_subdir(codec_root->module,

						  "152c1000.msm-sdw-codec",

						(const char *)name,

						codec_root);

	if (!msm_sdw->entry) {

		dev_err(codec->dev, "%s: failed to create msm_sdw entry\n",