提交 587691ea 编写于 作者: M Mark Brown

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

...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
struct cs4271_platform_data { struct cs4271_platform_data {
int gpio_nreset; /* GPIO driving Reset pin, if any */ 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 */ #endif /* __CS4271_H */
...@@ -474,16 +474,16 @@ static int cs4271_probe(struct snd_soc_codec *codec) ...@@ -474,16 +474,16 @@ static int cs4271_probe(struct snd_soc_codec *codec)
struct cs4271_platform_data *cs4271plat = codec->dev->platform_data; struct cs4271_platform_data *cs4271plat = codec->dev->platform_data;
int ret; int ret;
int gpio_nreset = -EINVAL; int gpio_nreset = -EINVAL;
int amutec_eq_bmutec = 0; bool amutec_eq_bmutec = false;
#ifdef CONFIG_OF #ifdef CONFIG_OF
if (of_match_device(cs4271_dt_ids, codec->dev)) { if (of_match_device(cs4271_dt_ids, codec->dev)) {
gpio_nreset = of_get_named_gpio(codec->dev->of_node, gpio_nreset = of_get_named_gpio(codec->dev->of_node,
"reset-gpio", 0); "reset-gpio", 0);
if (!of_get_property(codec->dev->of_node, if (of_get_property(codec->dev->of_node,
"cirrus,amutec-eq-bmutec", NULL)) "cirrus,amutec-eq-bmutec", NULL))
amutec_eq_bmutec = 1; amutec_eq_bmutec = true;
} }
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册