Merge "asoc: wsa883x: Fix speaker noise issue"
diff --git a/asoc/codecs/wsa883x/wsa883x.c b/asoc/codecs/wsa883x/wsa883x.c
index 1c73518..a2dbea6 100644
--- a/asoc/codecs/wsa883x/wsa883x.c
+++ b/asoc/codecs/wsa883x/wsa883x.c
@@ -1264,6 +1264,19 @@
return ret;
}
+static int wsa883x_swr_device_up(struct swr_device *pdev)
+{
+ struct wsa883x_priv *wsa883x;
+
+ wsa883x = swr_get_dev_data(pdev);
+ if (!wsa883x) {
+ dev_err(&pdev->dev, "%s: wsa883x is NULL\n", __func__);
+ return -EINVAL;
+ }
+ wsa883x_swr_up(wsa883x);
+ return 0;
+}
+
static int wsa883x_swr_down(struct wsa883x_priv *wsa883x)
{
int ret;
@@ -1275,6 +1288,19 @@
return ret;
}
+static int wsa883x_swr_device_down(struct swr_device *pdev)
+{
+ struct wsa883x_priv *wsa883x;
+
+ wsa883x = swr_get_dev_data(pdev);
+ if (!wsa883x) {
+ dev_err(&pdev->dev, "%s: wsa883x is NULL\n", __func__);
+ return -EINVAL;
+ }
+ wsa883x_swr_down(wsa883x);
+ return 0;
+}
+
static int wsa883x_swr_reset(struct wsa883x_priv *wsa883x)
{
u8 retry = WSA883X_NUM_RETRY;
@@ -1292,6 +1318,19 @@
return 0;
}
+static int wsa883x_swr_device_reset(struct swr_device *pdev)
+{
+ struct wsa883x_priv *wsa883x;
+
+ wsa883x = swr_get_dev_data(pdev);
+ if (!wsa883x) {
+ dev_err(&pdev->dev, "%s: wsa883x is NULL\n", __func__);
+ return -EINVAL;
+ }
+ wsa883x_swr_reset(wsa883x);
+ return 0;
+}
+
static int wsa883x_event_notify(struct notifier_block *nb,
unsigned long val, void *ptr)
{
@@ -1670,6 +1709,9 @@
.probe = wsa883x_swr_probe,
.remove = wsa883x_swr_remove,
.id_table = wsa883x_swr_id,
+ .device_up = wsa883x_swr_device_up,
+ .device_down = wsa883x_swr_device_down,
+ .reset_device = wsa883x_swr_device_reset,
};
static int __init wsa883x_swr_init(void)