Merge remote-tracking branches 'asoc/topic/rt5514', 'asoc/topic/rt5645', 'asoc/topic...

[linux-2.6-microblaze.git] / sound / soc / codecs / rt5514-spi.c

diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c
index b90d6d5..2144edc 100644 (file)
--- a/sound/soc/codecs/rt5514-spi.c
+++ b/sound/soc/codecs/rt5514-spi.c
@@ -147,8 +147,13 @@ done:
 
 static void rt5514_schedule_copy(struct rt5514_dsp *rt5514_dsp)
 {
+       size_t period_bytes;
        u8 buf[8];
 
+       if (!rt5514_dsp->substream)
+               return;
+
+       period_bytes = snd_pcm_lib_period_bytes(rt5514_dsp->substream);
        rt5514_dsp->get_size = 0;
 
        /**
@@ -176,6 +181,10 @@ static void rt5514_schedule_copy(struct rt5514_dsp *rt5514_dsp)
 
        rt5514_dsp->buf_size = rt5514_dsp->buf_limit - rt5514_dsp->buf_base;
 
+       if (rt5514_dsp->buf_size % period_bytes)
+               rt5514_dsp->buf_size = (rt5514_dsp->buf_size / period_bytes) *
+                       period_bytes;
+
        if (rt5514_dsp->buf_base && rt5514_dsp->buf_limit &&
                rt5514_dsp->buf_rp && rt5514_dsp->buf_size)
                schedule_delayed_work(&rt5514_dsp->copy_work, 0);
@@ -280,6 +289,8 @@ static int rt5514_spi_pcm_probe(struct snd_soc_platform *platform)
                        dev_err(&rt5514_spi->dev,
                                "%s Failed to reguest IRQ: %d\n", __func__,
                                ret);
+               else
+                       device_init_wakeup(rt5514_dsp->dev, true);
        }
 
        return 0;
@@ -451,6 +462,43 @@ static int rt5514_spi_probe(struct spi_device *spi)
        return 0;
 }
 
+static int __maybe_unused rt5514_suspend(struct device *dev)
+{
+       int irq = to_spi_device(dev)->irq;
+
+       if (device_may_wakeup(dev))
+               enable_irq_wake(irq);
+
+       return 0;
+}
+
+static int __maybe_unused rt5514_resume(struct device *dev)
+{
+       struct snd_soc_platform *platform = snd_soc_lookup_platform(dev);
+       struct rt5514_dsp *rt5514_dsp =
+               snd_soc_platform_get_drvdata(platform);
+       int irq = to_spi_device(dev)->irq;
+       u8 buf[8];
+
+       if (device_may_wakeup(dev))
+               disable_irq_wake(irq);
+
+       if (rt5514_dsp) {
+               if (rt5514_dsp->substream) {
+                       rt5514_spi_burst_read(RT5514_IRQ_CTRL, (u8 *)&buf,
+                               sizeof(buf));
+                       if (buf[0] & RT5514_IRQ_STATUS_BIT)
+                               rt5514_schedule_copy(rt5514_dsp);
+               }
+       }
+
+       return 0;
+}
+
+static const struct dev_pm_ops rt5514_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(rt5514_suspend, rt5514_resume)
+};
+
 static const struct of_device_id rt5514_of_match[] = {
        { .compatible = "realtek,rt5514", },
        {},
@@ -460,6 +508,7 @@ MODULE_DEVICE_TABLE(of, rt5514_of_match);
 static struct spi_driver rt5514_spi_driver = {
        .driver = {
                .name = "rt5514",
+               .pm = &rt5514_pm_ops,
                .of_match_table = of_match_ptr(rt5514_of_match),
        },
        .probe = rt5514_spi_probe,