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

Commit 587691ea authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/cs4271' into tmp

parents a18a31a1 b8455c9f

include/sound/cs4271.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


struct cs4271_platform_data {

	int gpio_nreset;	/* GPIO driving Reset pin, if any */

	int amutec_eq_bmutec:1;	/* flag to enable AMUTEC=BMUTEC */

	bool amutec_eq_bmutec;	/* flag to enable AMUTEC=BMUTEC */

};



#endif /* __CS4271_H */

sound/soc/codecs/cs4271.c

+3 −3
Original line number Diff line number Diff line
@@ -474,16 +474,16 @@ static int cs4271_probe(struct snd_soc_codec *codec) 
	struct cs4271_platform_data *cs4271plat = codec->dev->platform_data;

	int ret;

	int gpio_nreset = -EINVAL;

	int amutec_eq_bmutec = 0;

	bool amutec_eq_bmutec = false;



#ifdef CONFIG_OF

	if (of_match_device(cs4271_dt_ids, codec->dev)) {

		gpio_nreset = of_get_named_gpio(codec->dev->of_node,

						"reset-gpio", 0);



		if (!of_get_property(codec->dev->of_node,

		if (of_get_property(codec->dev->of_node,

				     "cirrus,amutec-eq-bmutec", NULL))

			amutec_eq_bmutec = 1;

			amutec_eq_bmutec = true;

	}

#endif