summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Mack2018-10-03 21:32:34 +0200
committerMark Brown2018-10-04 12:41:52 +0200
commit466dee75b3364d05b43ddfe41ef2e8887b6a3ea7 (patch)
tree54d36a3041d479e8911738d2fd94f39abeffa49c
parentASoC: pxa-ssp: enable and disable extclk if given (diff)
downloadkernel-qcow2-linux-466dee75b3364d05b43ddfe41ef2e8887b6a3ea7.tar.gz
kernel-qcow2-linux-466dee75b3364d05b43ddfe41ef2e8887b6a3ea7.tar.xz
kernel-qcow2-linux-466dee75b3364d05b43ddfe41ef2e8887b6a3ea7.zip
ASoC: add fault detect recovery property to DT bindings
The driver already has support for setting the FDRB bit in the CONFA register through platform data, but there was no property to set it in the device-tree bindings. Signed-off-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--Documentation/devicetree/bindings/sound/st,sta32x.txt3
-rw-r--r--sound/soc/codecs/sta32x.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/st,sta32x.txt b/Documentation/devicetree/bindings/sound/st,sta32x.txt
index 255de3ae5b2f..ff4a685a4303 100644
--- a/Documentation/devicetree/bindings/sound/st,sta32x.txt
+++ b/Documentation/devicetree/bindings/sound/st,sta32x.txt
@@ -39,6 +39,9 @@ Optional properties:
- st,thermal-warning-recover:
If present, thermal warning recovery is enabled.
+ - st,fault-detect-recovery:
+ If present, fault detect recovery is enabled.
+
- st,thermal-warning-adjustment:
If present, thermal warning adjustment is enabled.
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index d5035f2f2b2b..22de1593443c 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -1038,6 +1038,8 @@ static int sta32x_probe_dt(struct device *dev, struct sta32x_priv *sta32x)
of_property_read_u8(np, "st,ch3-output-mapping",
&pdata->ch3_output_mapping);
+ if (of_get_property(np, "st,fault-detect-recovery", NULL))
+ pdata->fault_detect_recovery = 1;
if (of_get_property(np, "st,thermal-warning-recovery", NULL))
pdata->thermal_warning_recovery = 1;
if (of_get_property(np, "st,thermal-warning-adjustment", NULL))