Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1394920
| From | Enric Balletbo i Serra <enric.balletbo@collabora.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 1/7] ASoC: rockchip: Revert "ASoC: rockchip: i2s: remove unused variables" |
| Date | 2016-05-05 10:10 +0200 |
| Message-ID | <rvmwa-4mY-7@gated-at.bofh.it> (permalink) |
| References | <rvmwa-4mY-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: John Keeping <john@metanate.com>
This reverts commit 5938448b99275cba95167c3f9d39ca9225fdad38.
It turns out that the commit that made these variables unused is wrong
so we're about to revert it. Bring back the variables in prepration.
Signed-off-by: John Keeping <john@metanate.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---
sound/soc/rockchip/rockchip_i2s.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 2f8e204..34743ec 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -34,6 +34,13 @@ struct rk_i2s_dev {
struct regmap *regmap;
+/*
+ * Used to indicate the tx/rx status.
+ * I2S controller hopes to start the tx and rx together,
+ * also to stop them when they are both try to stop.
+*/
+ bool tx_start;
+ bool rx_start;
bool is_master_mode;
};
@@ -77,7 +84,11 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)
regmap_update_bits(i2s->regmap, I2S_XFER,
I2S_XFER_TXS_START,
I2S_XFER_TXS_START);
+
+ i2s->tx_start = true;
} else {
+ i2s->tx_start = false;
+
regmap_update_bits(i2s->regmap, I2S_DMACR,
I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE);
@@ -115,7 +126,11 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on)
regmap_update_bits(i2s->regmap, I2S_XFER,
I2S_XFER_RXS_START,
I2S_XFER_RXS_START);
+
+ i2s->rx_start = true;
} else {
+ i2s->rx_start = false;
+
regmap_update_bits(i2s->regmap, I2S_DMACR,
I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_DISABLE);
--
2.1.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/7] ASoC: rockchip: Fix audio on Veyron. Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
[PATCH 1/7] ASoC: rockchip: Revert "ASoC: rockchip: i2s: remove unused variables" Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
[PATCH 7/7] ARM: dts: rockchip: veyron: Add analog audio codecs. Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
[PATCH 2/7] ASoC: rockchip: Revert "ASoC: rockchip: i2s: separate capture and playback" Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
[PATCH 5/7] ASoC: rockchip-max98090: Fix DAPM unknown pin for Headset Jack Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
Re: [PATCH 5/7] ASoC: rockchip-max98090: Fix DAPM unknown pin for Headset Jack Mark Brown <broonie@kernel.org> - 2016-05-05 21:30 +0200
[PATCH 4/7] ASoC: rockchip-max98090: Fix the Headset Mic route. Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
Re: [PATCH 4/7] ASoC: rockchip-max98090: Fix the Headset Mic route. Mark Brown <broonie@kernel.org> - 2016-05-05 21:20 +0200
Applied "ASoC: rockchip-max98090: Fix the Headset Mic route." to the asoc tree Mark Brown <broonie@kernel.org> - 2016-05-10 21:00 +0200
[PATCH 3/7] ASoC: rockchip-max98090: Fix NULL pointer de reference while accessing to jack Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
Applied "ASoC: rockchip-max98090: Fix NULL pointer dereference while accessing to jack." to the asoc tree Mark Brown <broonie@kernel.org> - 2016-05-10 21:00 +0200
[PATCH 6/7] ARM: dts: rockchip: Add shared file for audio related nodes for veyron boards Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
csiph-web