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

Commit ee61b892 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/fsl',... 

Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/fsl', 'asoc/topic/gpio-chip' and 'asoc/topic/hdmi' into asoc-next
parents 480d060b 35397ede f26b3b2a c59b24f8 3fb7b4e4

sound/soc/codecs/hdac_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream, 
			(!pin->eld.eld_valid)) {



		dev_warn(&hdac->hdac.dev,

			"Failed: montior present? %d ELD valid?: %d for pin: %d\n",

			"Failed: monitor present? %d ELD valid?: %d for pin: %d\n",

			pin->eld.monitor_present, pin->eld.eld_valid, pin->nid);



		return 0;

sound/soc/codecs/rt5677.c

+1 −1
Original line number Diff line number Diff line
@@ -4657,7 +4657,7 @@ static int rt5677_to_irq(struct gpio_chip *chip, unsigned offset) 
	return regmap_irq_get_virq(data, irq);

}



static struct gpio_chip rt5677_template_chip = {

static const struct gpio_chip rt5677_template_chip = {

	.label			= "rt5677",

	.owner			= THIS_MODULE,

	.direction_output	= rt5677_gpio_direction_out,

sound/soc/codecs/wm5100.c

+1 −1
Original line number Diff line number Diff line
@@ -2285,7 +2285,7 @@ static int wm5100_gpio_direction_in(struct gpio_chip *chip, unsigned offset) 
				  (1 << WM5100_GP1_DIR_SHIFT));

}



static struct gpio_chip wm5100_template_chip = {

static const struct gpio_chip wm5100_template_chip = {

	.label			= "wm5100",

	.owner			= THIS_MODULE,

	.direction_output	= wm5100_gpio_direction_out,

sound/soc/codecs/wm8903.c

+1 −1
Original line number Diff line number Diff line
@@ -1830,7 +1830,7 @@ static void wm8903_gpio_set(struct gpio_chip *chip, unsigned offset, int value) 
			   !!value << WM8903_GP1_LVL_SHIFT);

}



static struct gpio_chip wm8903_template_chip = {

static const struct gpio_chip wm8903_template_chip = {

	.label			= "wm8903",

	.owner			= THIS_MODULE,

	.request		= wm8903_gpio_request,

sound/soc/codecs/wm8962.c

+1 −1
Original line number Diff line number Diff line
@@ -3357,7 +3357,7 @@ static int wm8962_gpio_direction_out(struct gpio_chip *chip, 
	return 0;

}



static struct gpio_chip wm8962_template_chip = {

static const struct gpio_chip wm8962_template_chip = {

	.label			= "wm8962",

	.owner			= THIS_MODULE,

	.request		= wm8962_gpio_request,