From f70575805708cabdedea7498aaa3f710fde4d920 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 31 Jan 2024 03:29:01 +0000
Subject: [PATCH] add lvds1024*800
---
kernel/sound/soc/rockchip/rockchip_i2s_tdm.c | 847 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 781 insertions(+), 66 deletions(-)
diff --git a/kernel/sound/soc/rockchip/rockchip_i2s_tdm.c b/kernel/sound/soc/rockchip/rockchip_i2s_tdm.c
index 1824ea5..612c263 100644
--- a/kernel/sound/soc/rockchip/rockchip_i2s_tdm.c
+++ b/kernel/sound/soc/rockchip/rockchip_i2s_tdm.c
@@ -19,6 +19,7 @@
#include <linux/clk.h>
#include <linux/clk-provider.h>
#include <linux/clk/rockchip.h>
+#include <linux/pinctrl/consumer.h>
#include <linux/pm_runtime.h>
#include <linux/regmap.h>
#include <linux/reset.h>
@@ -27,11 +28,41 @@
#include <sound/dmaengine_pcm.h>
#include "rockchip_i2s_tdm.h"
+#include "rockchip_dlp_pcm.h"
+#include "rockchip_utils.h"
#define DRV_NAME "rockchip-i2s-tdm"
#if IS_ENABLED(CONFIG_CPU_PX30) || IS_ENABLED(CONFIG_CPU_RK1808) || IS_ENABLED(CONFIG_CPU_RK3308)
#define HAVE_SYNC_RESET
+#endif
+
+#ifdef CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES
+/*
+ * Example: RK3588
+ *
+ * Use I2S2_2CH as Clk-Gen to serve TDM_MULTI_LANES
+ *
+ * I2S2_2CH ----> BCLK,I2S_LRCK --------> I2S0_8CH_TX (Slave TRCM-TXONLY)
+ * |
+ * |--------> BCLK,TDM_SYNC --------> TDM Device (Slave)
+ *
+ * Note:
+ *
+ * I2S2_2CH_MCLK: BCLK
+ * I2S2_2CH_SCLK: I2S_LRCK (GPIO2_B7)
+ * I2S2_2CH_LRCK: TDM_SYNC (GPIO2_C0)
+ *
+ */
+
+#define CLK_MAX_COUNT 1000
+#define NSAMPLES 4
+#define XFER_EN 0x3
+#define XFER_DIS 0x0
+#define CKR_V(m, r, t) ((m - 1) << 16 | (r - 1) << 8 | (t - 1) << 0)
+#define I2S_XCR_IBM_V(v) ((v) & I2S_TXCR_IBM_MASK)
+#define I2S_XCR_IBM_NORMAL I2S_TXCR_IBM_NORMAL
+#define I2S_XCR_IBM_LSJM I2S_TXCR_IBM_LSJM
#endif
#define DEFAULT_MCLK_FS 256
@@ -41,6 +72,7 @@
#define CLK_PPM_MIN (-1000)
#define CLK_PPM_MAX (1000)
#define MAXBURST_PER_FIFO 8
+#define WAIT_TIME_MS_MAX 10000
#define QUIRK_ALWAYS_ON BIT(0)
#define QUIRK_HDMI_PATH BIT(1)
@@ -85,8 +117,11 @@
struct snd_dmaengine_dai_dma_data capture_dma_data;
struct snd_dmaengine_dai_dma_data playback_dma_data;
struct snd_pcm_substream *substreams[SNDRV_PCM_STREAM_LAST + 1];
+ unsigned int wait_time[SNDRV_PCM_STREAM_LAST + 1];
struct reset_control *tx_reset;
struct reset_control *rx_reset;
+ struct pinctrl *pinctrl;
+ struct pinctrl_state *clk_state;
const struct rk_i2s_soc_data *soc_data;
#ifdef HAVE_SYNC_RESET
void __iomem *cru_base;
@@ -98,6 +133,7 @@
bool mclk_calibrate;
bool tdm_mode;
bool tdm_fsync_half_frame;
+ bool is_dma_active[SNDRV_PCM_STREAM_LAST + 1];
unsigned int mclk_rx_freq;
unsigned int mclk_tx_freq;
unsigned int mclk_root0_freq;
@@ -109,9 +145,19 @@
unsigned int i2s_sdis[CH_GRP_MAX];
unsigned int i2s_sdos[CH_GRP_MAX];
unsigned int quirks;
+ unsigned int lrck_ratio;
int clk_ppm;
atomic_t refcount;
spinlock_t lock; /* xfer lock */
+#ifdef CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES
+ struct snd_soc_dai *clk_src_dai;
+ struct gpio_desc *i2s_lrck_gpio;
+ struct gpio_desc *tdm_fsync_gpio;
+ unsigned int tx_lanes;
+ unsigned int rx_lanes;
+ void __iomem *clk_src_base;
+ bool is_tdm_multi_lanes;
+#endif
};
static struct i2s_of_quirks {
@@ -159,6 +205,20 @@
clk_disable_unprepare(i2s_tdm->mclk_tx);
clk_disable_unprepare(i2s_tdm->mclk_rx);
+ pinctrl_pm_select_idle_state(dev);
+
+ return 0;
+}
+
+static int rockchip_i2s_tdm_pinctrl_select_clk_state(struct device *dev)
+{
+ struct rk_i2s_tdm_dev *i2s_tdm = dev_get_drvdata(dev);
+
+ if (IS_ERR_OR_NULL(i2s_tdm->pinctrl) || !i2s_tdm->clk_state)
+ return 0;
+
+ pinctrl_select_state(i2s_tdm->pinctrl, i2s_tdm->clk_state);
+
return 0;
}
@@ -166,6 +226,13 @@
{
struct rk_i2s_tdm_dev *i2s_tdm = dev_get_drvdata(dev);
int ret;
+
+ /*
+ * pinctrl default state is invoked by ASoC framework, so,
+ * we just handle clk state here if DT assigned.
+ */
+ if (i2s_tdm->is_master_mode)
+ rockchip_i2s_tdm_pinctrl_select_clk_state(dev);
ret = clk_prepare_enable(i2s_tdm->mclk_tx);
if (ret)
@@ -180,6 +247,13 @@
ret = regcache_sync(i2s_tdm->regmap);
if (ret)
goto err_regmap;
+
+ /*
+ * should be placed after regcache sync done to back
+ * to the slave mode and then enable clk state.
+ */
+ if (!i2s_tdm->is_master_mode)
+ rockchip_i2s_tdm_pinctrl_select_clk_state(dev);
return 0;
@@ -206,6 +280,18 @@
return (val & I2S_XFER_TXS_START);
else
return (val & I2S_XFER_RXS_START);
+}
+
+static inline bool is_dma_active(struct rk_i2s_tdm_dev *i2s_tdm, int stream)
+{
+ unsigned int val;
+
+ regmap_read(i2s_tdm->regmap, I2S_DMACR, &val);
+
+ if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+ return (val & I2S_DMACR_TDE_MASK);
+ else
+ return (val & I2S_DMACR_RDE_MASK);
}
#ifdef HAVE_SYNC_RESET
@@ -266,7 +352,7 @@
writeq(val, addr);
break;
}
- /* fallthrough */
+ fallthrough;
default:
local_irq_save(flags);
writel(BIT(tx_offset) | (BIT(tx_offset) << 16),
@@ -328,7 +414,7 @@
writeq(val, addr);
break;
}
- /* fallthrough */
+ fallthrough;
default:
local_irq_save(flags);
writel((BIT(tx_offset) << 16),
@@ -395,6 +481,12 @@
default:
return -EINVAL;
}
+
+ regmap_update_bits(i2s_tdm->regmap, I2S_CLR, clr, clr);
+ ret = regmap_read_poll_timeout_atomic(i2s_tdm->regmap, I2S_CLR, val,
+ !(val & clr), 10, 100);
+ if (ret == 0)
+ return 0;
/*
* Workaround for FIFO clear on SLAVE mode:
@@ -508,9 +600,289 @@
rockchip_i2s_tdm_fifo_xrun_detect(i2s_tdm, stream, 1);
}
+#ifdef CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES
+static const char * const tx_lanes_text[] = { "Auto", "SDOx1", "SDOx2", "SDOx3", "SDOx4" };
+static const char * const rx_lanes_text[] = { "Auto", "SDIx1", "SDIx2", "SDIx3", "SDIx4" };
+static const struct soc_enum tx_lanes_enum =
+ SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(tx_lanes_text), tx_lanes_text);
+static const struct soc_enum rx_lanes_enum =
+ SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(rx_lanes_text), rx_lanes_text);
+
+static int rockchip_i2s_tdm_tx_lanes_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_component_get_drvdata(component);
+
+ ucontrol->value.enumerated.item[0] = i2s_tdm->tx_lanes;
+
+ return 0;
+}
+
+static int rockchip_i2s_tdm_tx_lanes_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_component_get_drvdata(component);
+ int num;
+
+ num = ucontrol->value.enumerated.item[0];
+ if (num >= ARRAY_SIZE(tx_lanes_text))
+ return -EINVAL;
+
+ i2s_tdm->tx_lanes = num;
+
+ return 1;
+}
+
+static int rockchip_i2s_tdm_rx_lanes_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_component_get_drvdata(component);
+
+ ucontrol->value.enumerated.item[0] = i2s_tdm->rx_lanes;
+
+ return 0;
+}
+
+static int rockchip_i2s_tdm_rx_lanes_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_component_get_drvdata(component);
+ int num;
+
+ num = ucontrol->value.enumerated.item[0];
+ if (num >= ARRAY_SIZE(rx_lanes_text))
+ return -EINVAL;
+
+ i2s_tdm->rx_lanes = num;
+
+ return 1;
+}
+
+static int rockchip_i2s_tdm_get_lanes(struct rk_i2s_tdm_dev *i2s_tdm, int stream)
+{
+ unsigned int lanes = 1;
+
+ if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ if (i2s_tdm->tx_lanes)
+ lanes = i2s_tdm->tx_lanes;
+ } else {
+ if (i2s_tdm->rx_lanes)
+ lanes = i2s_tdm->rx_lanes;
+ }
+
+ return lanes;
+}
+
+static struct snd_soc_dai *rockchip_i2s_tdm_find_dai(struct device_node *np)
+{
+ struct snd_soc_dai_link_component dai_component = { 0 };
+
+ dai_component.of_node = np;
+
+ return snd_soc_find_dai_with_mutex(&dai_component);
+}
+
+static int rockchip_i2s_tdm_multi_lanes_set_clk(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params,
+ struct snd_soc_dai *cpu_dai)
+{
+ struct rk_i2s_tdm_dev *i2s_tdm = to_info(cpu_dai);
+ struct snd_soc_dai *dai = i2s_tdm->clk_src_dai;
+ unsigned int div, mclk_rate;
+ unsigned int lanes, ch_per_lane;
+
+ lanes = rockchip_i2s_tdm_get_lanes(i2s_tdm, substream->stream);
+ ch_per_lane = params_channels(params) / lanes;
+ mclk_rate = ch_per_lane * params_rate(params) * 32;
+ div = ch_per_lane / 2;
+
+ /* Do nothing when use external clk src */
+ if (dai && dai->driver->ops) {
+ if (dai->driver->ops->set_sysclk)
+ dai->driver->ops->set_sysclk(dai, substream->stream, mclk_rate, 0);
+
+ writel(XFER_DIS, i2s_tdm->clk_src_base + I2S_XFER);
+ writel(CKR_V(64, div, div), i2s_tdm->clk_src_base + I2S_CKR);
+ writel(XFER_EN, i2s_tdm->clk_src_base + I2S_XFER);
+ }
+
+ i2s_tdm->lrck_ratio = div;
+ i2s_tdm->mclk_tx_freq = mclk_rate;
+ i2s_tdm->mclk_rx_freq = mclk_rate;
+
+ return 0;
+}
+
+static inline int tdm_multi_lanes_clk_assert_h(const struct gpio_desc *desc)
+{
+ int cnt = CLK_MAX_COUNT;
+
+ while (gpiod_get_raw_value(desc) && --cnt)
+ ;
+
+ return cnt;
+}
+
+static inline int tdm_multi_lanes_clk_assert_l(const struct gpio_desc *desc)
+{
+ int cnt = CLK_MAX_COUNT;
+
+ while (!gpiod_get_raw_value(desc) && --cnt)
+ ;
+
+ return cnt;
+}
+
+static inline bool rockchip_i2s_tdm_clk_valid(struct rk_i2s_tdm_dev *i2s_tdm)
+{
+ int dc_h = CLK_MAX_COUNT, dc_l = CLK_MAX_COUNT;
+
+ /*
+ * TBD: optimize debounce and get value
+ *
+ * debounce at least one cycle found, otherwise, the clk ref maybe
+ * not on the fly.
+ */
+
+ /* check HIGH-Level */
+ dc_h = tdm_multi_lanes_clk_assert_h(i2s_tdm->i2s_lrck_gpio);
+ if (!dc_h)
+ return false;
+
+ /* check LOW-Level */
+ dc_l = tdm_multi_lanes_clk_assert_l(i2s_tdm->i2s_lrck_gpio);
+ if (!dc_l)
+ return false;
+
+ /* check HIGH-Level */
+ dc_h = tdm_multi_lanes_clk_assert_h(i2s_tdm->tdm_fsync_gpio);
+ if (!dc_h)
+ return false;
+
+ /* check LOW-Level */
+ dc_l = tdm_multi_lanes_clk_assert_l(i2s_tdm->tdm_fsync_gpio);
+ if (!dc_l)
+ return false;
+
+ return true;
+}
+
+static void __maybe_unused rockchip_i2s_tdm_gpio_clk_meas(struct rk_i2s_tdm_dev *i2s_tdm,
+ const struct gpio_desc *desc,
+ const char *name)
+{
+ int h[NSAMPLES], l[NSAMPLES], i;
+
+ dev_dbg(i2s_tdm->dev, "%s:\n", name);
+
+ if (!rockchip_i2s_tdm_clk_valid(i2s_tdm))
+ return;
+
+ for (i = 0; i < NSAMPLES; i++) {
+ h[i] = tdm_multi_lanes_clk_assert_h(desc);
+ l[i] = tdm_multi_lanes_clk_assert_l(desc);
+ }
+
+ for (i = 0; i < NSAMPLES; i++)
+ dev_dbg(i2s_tdm->dev, "H[%d]: %2d, L[%d]: %2d\n",
+ i, CLK_MAX_COUNT - h[i], i, CLK_MAX_COUNT - l[i]);
+}
+
+static int rockchip_i2s_tdm_multi_lanes_start(struct rk_i2s_tdm_dev *i2s_tdm, int stream)
+{
+ unsigned int tdm_h = 0, tdm_l = 0, i2s_h = 0, i2s_l = 0;
+ unsigned int msk, val, reg, fmt;
+ unsigned long flags;
+
+ if (!i2s_tdm->tdm_fsync_gpio || !i2s_tdm->i2s_lrck_gpio)
+ return -ENOSYS;
+
+ if (i2s_tdm->lrck_ratio != 4 && i2s_tdm->lrck_ratio != 8)
+ return -EINVAL;
+
+ if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ msk = I2S_XFER_TXS_MASK;
+ val = I2S_XFER_TXS_START;
+ reg = I2S_TXCR;
+ } else {
+ msk = I2S_XFER_RXS_MASK;
+ val = I2S_XFER_RXS_START;
+ reg = I2S_RXCR;
+ }
+
+ regmap_read(i2s_tdm->regmap, reg, &fmt);
+ fmt = I2S_XCR_IBM_V(fmt);
+
+ local_irq_save(flags);
+
+ if (!rockchip_i2s_tdm_clk_valid(i2s_tdm)) {
+ local_irq_restore(flags);
+ dev_err(i2s_tdm->dev, "Invalid LRCK / FSYNC measured by ref IO\n");
+ return -EINVAL;
+ }
+
+ switch (fmt) {
+ case I2S_XCR_IBM_NORMAL:
+ tdm_h = tdm_multi_lanes_clk_assert_h(i2s_tdm->tdm_fsync_gpio);
+ tdm_l = tdm_multi_lanes_clk_assert_l(i2s_tdm->tdm_fsync_gpio);
+
+ if (i2s_tdm->lrck_ratio == 8) {
+ tdm_multi_lanes_clk_assert_l(i2s_tdm->i2s_lrck_gpio);
+ tdm_multi_lanes_clk_assert_h(i2s_tdm->i2s_lrck_gpio);
+ tdm_multi_lanes_clk_assert_l(i2s_tdm->i2s_lrck_gpio);
+ tdm_multi_lanes_clk_assert_h(i2s_tdm->i2s_lrck_gpio);
+ }
+
+ i2s_l = tdm_multi_lanes_clk_assert_l(i2s_tdm->i2s_lrck_gpio);
+
+ if (stream == SNDRV_PCM_STREAM_CAPTURE)
+ i2s_h = tdm_multi_lanes_clk_assert_h(i2s_tdm->i2s_lrck_gpio);
+ break;
+ case I2S_XCR_IBM_LSJM:
+ tdm_l = tdm_multi_lanes_clk_assert_l(i2s_tdm->tdm_fsync_gpio);
+ tdm_h = tdm_multi_lanes_clk_assert_h(i2s_tdm->tdm_fsync_gpio);
+
+ if (i2s_tdm->lrck_ratio == 8) {
+ tdm_multi_lanes_clk_assert_h(i2s_tdm->i2s_lrck_gpio);
+ tdm_multi_lanes_clk_assert_l(i2s_tdm->i2s_lrck_gpio);
+ tdm_multi_lanes_clk_assert_h(i2s_tdm->i2s_lrck_gpio);
+ tdm_multi_lanes_clk_assert_l(i2s_tdm->i2s_lrck_gpio);
+ }
+
+ tdm_multi_lanes_clk_assert_h(i2s_tdm->i2s_lrck_gpio);
+
+ i2s_l = tdm_multi_lanes_clk_assert_l(i2s_tdm->i2s_lrck_gpio);
+ i2s_h = tdm_multi_lanes_clk_assert_h(i2s_tdm->i2s_lrck_gpio);
+ break;
+ default:
+ local_irq_restore(flags);
+ return -EINVAL;
+ }
+
+ regmap_update_bits(i2s_tdm->regmap, I2S_XFER, msk, val);
+ local_irq_restore(flags);
+
+ dev_dbg(i2s_tdm->dev, "STREAM[%d]: TDM-H: %d, TDM-L: %d, I2S-H: %d, I2S-L: %d\n", stream,
+ CLK_MAX_COUNT - tdm_h, CLK_MAX_COUNT - tdm_l,
+ CLK_MAX_COUNT - i2s_h, CLK_MAX_COUNT - i2s_l);
+
+ return 0;
+}
+#endif
+
static void rockchip_i2s_tdm_xfer_start(struct rk_i2s_tdm_dev *i2s_tdm,
int stream)
{
+#ifdef CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES
+ if (i2s_tdm->is_tdm_multi_lanes) {
+ if (rockchip_i2s_tdm_multi_lanes_start(i2s_tdm, stream) != -ENOSYS)
+ return;
+ }
+#endif
if (i2s_tdm->clk_trcm) {
rockchip_i2s_tdm_reset_assert(i2s_tdm);
regmap_update_bits(i2s_tdm->regmap, I2S_XFER,
@@ -586,6 +958,9 @@
int stream = substream->stream;
int bstream = SNDRV_PCM_STREAM_LAST - stream;
+ /* store the current state, prepare for resume if necessary */
+ i2s_tdm->is_dma_active[bstream] = is_dma_active(i2s_tdm, bstream);
+
/* disable dma for both tx and rx */
rockchip_i2s_tdm_dma_ctrl(i2s_tdm, stream, 0);
rockchip_i2s_tdm_dma_ctrl(i2s_tdm, bstream, 0);
@@ -601,7 +976,8 @@
* just resume bstream, because current stream will be
* startup in the trigger-cmd-START
*/
- rockchip_i2s_tdm_dma_ctrl(i2s_tdm, bstream, 1);
+ if (i2s_tdm->is_dma_active[bstream])
+ rockchip_i2s_tdm_dma_ctrl(i2s_tdm, bstream, 1);
rockchip_i2s_tdm_xfer_start(i2s_tdm, bstream);
}
@@ -654,6 +1030,19 @@
case SND_SOC_DAIFMT_CBM_CFM:
val = I2S_CKR_MSS_SLAVE;
i2s_tdm->is_master_mode = false;
+ /*
+ * TRCM require TX/RX enabled at the same time, or need the one
+ * which provide clk enabled at first for master mode.
+ *
+ * It is quite a different for slave mode which does not have
+ * these restrictions, because the BCLK / LRCK are provided by
+ * external master devices.
+ *
+ * So, we just set the right clk path value on TRCM register on
+ * stage probe and then drop the trcm value to make TX / RX work
+ * independently.
+ */
+ i2s_tdm->clk_trcm = 0;
break;
default:
ret = -EINVAL;
@@ -924,13 +1313,26 @@
switch (i2s_tdm->clk_trcm) {
case I2S_CKR_TRCM_TXONLY:
parent = clk_get_parent(i2s_tdm->mclk_tx);
+ /*
+ * API clk_has_parent is not available yet on GKI, so we
+ * use clk_set_parent directly and ignore the ret value.
+ * if the API has addressed on GKI, should remove it.
+ */
+#ifdef CONFIG_NO_GKI
if (clk_has_parent(i2s_tdm->mclk_rx, parent))
ret = clk_set_parent(i2s_tdm->mclk_rx, parent);
+#else
+ clk_set_parent(i2s_tdm->mclk_rx, parent);
+#endif
break;
case I2S_CKR_TRCM_RXONLY:
parent = clk_get_parent(i2s_tdm->mclk_rx);
+#ifdef CONFIG_NO_GKI
if (clk_has_parent(i2s_tdm->mclk_tx, parent))
ret = clk_set_parent(i2s_tdm->mclk_tx, parent);
+#else
+ clk_set_parent(i2s_tdm->mclk_tx, parent);
+#endif
break;
}
@@ -1202,6 +1604,32 @@
unsigned int reg_fmt, fmt;
int ret = 0;
+#ifdef CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES
+ if (i2s_tdm->is_tdm_multi_lanes) {
+ unsigned int lanes = rockchip_i2s_tdm_get_lanes(i2s_tdm,
+ substream->stream);
+
+ switch (lanes) {
+ case 4:
+ ret = I2S_CHN_8;
+ break;
+ case 3:
+ ret = I2S_CHN_6;
+ break;
+ case 2:
+ ret = I2S_CHN_4;
+ break;
+ case 1:
+ ret = I2S_CHN_2;
+ break;
+ default:
+ ret = -EINVAL;
+ break;
+ }
+
+ return ret;
+ }
+#endif
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
reg_fmt = I2S_TXCR;
else
@@ -1251,6 +1679,25 @@
return ret;
}
+static void rockchip_i2s_tdm_get_performance(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params,
+ struct snd_soc_dai *dai,
+ unsigned int csr)
+{
+ struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai);
+ unsigned int tdl;
+ int fifo;
+
+ regmap_read(i2s_tdm->regmap, I2S_DMACR, &tdl);
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ fifo = I2S_DMACR_TDL_V(tdl) * I2S_TXCR_CSR_V(csr);
+ else
+ fifo = I2S_DMACR_RDL_V(tdl) * I2S_RXCR_CSR_V(csr);
+
+ rockchip_utils_get_performance(substream, params, dai, fifo);
+}
+
static int rockchip_i2s_tdm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai)
@@ -1260,8 +1707,12 @@
struct clk *mclk;
int ret = 0;
unsigned int val = 0;
- unsigned int mclk_rate, bclk_rate, div_bclk = 4, div_lrck = 64;
+ unsigned int mclk_rate, bclk_rate, lrck_rate, div_bclk = 4, div_lrck = 64;
+#ifdef CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES
+ if (i2s_tdm->is_tdm_multi_lanes)
+ rockchip_i2s_tdm_multi_lanes_set_clk(substream, params, dai);
+#endif
dma_data = snd_soc_dai_get_dma_data(dai, substream);
dma_data->maxburst = MAXBURST_PER_FIFO * params_channels(params) / 2;
@@ -1274,13 +1725,14 @@
goto err;
mclk_rate = clk_get_rate(mclk);
- bclk_rate = i2s_tdm->bclk_fs * params_rate(params);
+ lrck_rate = params_rate(params) * i2s_tdm->lrck_ratio;
+ bclk_rate = i2s_tdm->bclk_fs * lrck_rate;
if (!bclk_rate) {
ret = -EINVAL;
goto err;
}
div_bclk = DIV_ROUND_CLOSEST(mclk_rate, bclk_rate);
- div_lrck = bclk_rate / params_rate(params);
+ div_lrck = bclk_rate / lrck_rate;
switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S8:
@@ -1308,6 +1760,8 @@
if (ret < 0)
goto err;
+ rockchip_i2s_tdm_get_performance(substream, params, dai, ret);
+
val |= ret;
if (!is_params_dirty(substream, dai, div_bclk, div_lrck, val))
return 0;
@@ -1321,6 +1775,13 @@
err:
return ret;
+}
+static int rockchip_i2s_tdm_hw_free(struct snd_pcm_substream *substream,
+ struct snd_soc_dai *dai)
+{
+ rockchip_utils_put_performance(substream, dai);
+
+ return 0;
}
static int rockchip_i2s_tdm_trigger(struct snd_pcm_substream *substream,
@@ -1385,8 +1846,8 @@
static int rockchip_i2s_tdm_clk_compensation_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
- struct snd_soc_dai *dai = snd_kcontrol_chip(kcontrol);
- struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_dai_get_drvdata(dai);
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = i2s_tdm->clk_ppm;
@@ -1396,8 +1857,8 @@
static int rockchip_i2s_tdm_clk_compensation_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
- struct snd_soc_dai *dai = snd_kcontrol_chip(kcontrol);
- struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_dai_get_drvdata(dai);
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_component_get_drvdata(component);
int ret = 0, ppm = 0;
if ((ucontrol->value.integer.value[0] < CLK_PPM_MIN) ||
@@ -1509,10 +1970,116 @@
return 0;
}
+static const char * const rpaths_text[] = {
+ "From SDI0", "From SDI1", "From SDI2", "From SDI3" };
+
+static const char * const tpaths_text[] = {
+ "From PATH0", "From PATH1", "From PATH2", "From PATH3" };
+
+/* TXCR */
+static SOC_ENUM_SINGLE_DECL(tpath3_enum, I2S_TXCR, 29, tpaths_text);
+static SOC_ENUM_SINGLE_DECL(tpath2_enum, I2S_TXCR, 27, tpaths_text);
+static SOC_ENUM_SINGLE_DECL(tpath1_enum, I2S_TXCR, 25, tpaths_text);
+static SOC_ENUM_SINGLE_DECL(tpath0_enum, I2S_TXCR, 23, tpaths_text);
+
+/* RXCR */
+static SOC_ENUM_SINGLE_DECL(rpath3_enum, I2S_RXCR, 23, rpaths_text);
+static SOC_ENUM_SINGLE_DECL(rpath2_enum, I2S_RXCR, 21, rpaths_text);
+static SOC_ENUM_SINGLE_DECL(rpath1_enum, I2S_RXCR, 19, rpaths_text);
+static SOC_ENUM_SINGLE_DECL(rpath0_enum, I2S_RXCR, 17, rpaths_text);
+
+static int rockchip_i2s_tdm_wait_time_info(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_info *uinfo)
+{
+ uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+ uinfo->count = 1;
+ uinfo->value.integer.min = 0;
+ uinfo->value.integer.max = WAIT_TIME_MS_MAX;
+ uinfo->value.integer.step = 1;
+
+ return 0;
+}
+
+static int rockchip_i2s_tdm_rd_wait_time_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_component_get_drvdata(component);
+
+ ucontrol->value.integer.value[0] = i2s_tdm->wait_time[SNDRV_PCM_STREAM_CAPTURE];
+
+ return 0;
+}
+
+static int rockchip_i2s_tdm_rd_wait_time_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_component_get_drvdata(component);
+
+ if (ucontrol->value.integer.value[0] > WAIT_TIME_MS_MAX)
+ return -EINVAL;
+
+ i2s_tdm->wait_time[SNDRV_PCM_STREAM_CAPTURE] = ucontrol->value.integer.value[0];
+
+ return 1;
+}
+
+static int rockchip_i2s_tdm_wr_wait_time_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_component_get_drvdata(component);
+
+ ucontrol->value.integer.value[0] = i2s_tdm->wait_time[SNDRV_PCM_STREAM_PLAYBACK];
+
+ return 0;
+}
+
+static int rockchip_i2s_tdm_wr_wait_time_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_component_get_drvdata(component);
+
+ if (ucontrol->value.integer.value[0] > WAIT_TIME_MS_MAX)
+ return -EINVAL;
+
+ i2s_tdm->wait_time[SNDRV_PCM_STREAM_PLAYBACK] = ucontrol->value.integer.value[0];
+
+ return 1;
+}
+
+#define SAI_PCM_WAIT_TIME(xname, xhandler_get, xhandler_put) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, \
+ .info = rockchip_i2s_tdm_wait_time_info, \
+ .get = xhandler_get, .put = xhandler_put }
+
static const struct snd_kcontrol_new rockchip_i2s_tdm_snd_controls[] = {
+ SOC_ENUM("Receive PATH3 Source Select", rpath3_enum),
+ SOC_ENUM("Receive PATH2 Source Select", rpath2_enum),
+ SOC_ENUM("Receive PATH1 Source Select", rpath1_enum),
+ SOC_ENUM("Receive PATH0 Source Select", rpath0_enum),
+ SOC_ENUM("Transmit SDO3 Source Select", tpath3_enum),
+ SOC_ENUM("Transmit SDO2 Source Select", tpath2_enum),
+ SOC_ENUM("Transmit SDO1 Source Select", tpath1_enum),
+ SOC_ENUM("Transmit SDO0 Source Select", tpath0_enum),
+
SOC_ENUM_EXT("I2STDM Digital Loopback Mode", loopback_mode,
rockchip_i2s_tdm_loopback_get,
rockchip_i2s_tdm_loopback_put),
+#ifdef CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES
+ SOC_ENUM_EXT("Transmit SDOx Select", tx_lanes_enum,
+ rockchip_i2s_tdm_tx_lanes_get, rockchip_i2s_tdm_tx_lanes_put),
+ SOC_ENUM_EXT("Receive SDIx Select", rx_lanes_enum,
+ rockchip_i2s_tdm_rx_lanes_get, rockchip_i2s_tdm_rx_lanes_put),
+#endif
+ SAI_PCM_WAIT_TIME("PCM Read Wait Time MS",
+ rockchip_i2s_tdm_rd_wait_time_get,
+ rockchip_i2s_tdm_rd_wait_time_put),
+ SAI_PCM_WAIT_TIME("PCM Write Wait Time MS",
+ rockchip_i2s_tdm_wr_wait_time_get,
+ rockchip_i2s_tdm_wr_wait_time_put),
};
static int rockchip_i2s_tdm_dai_probe(struct snd_soc_dai *dai)
@@ -1523,7 +2090,9 @@
dai->playback_dma_data = &i2s_tdm->playback_dma_data;
if (i2s_tdm->mclk_calibrate)
- snd_soc_add_dai_controls(dai, &rockchip_i2s_tdm_compensation_control, 1);
+ snd_soc_add_component_controls(dai->component,
+ &rockchip_i2s_tdm_compensation_control,
+ 1);
return 0;
}
@@ -1554,11 +2123,15 @@
struct snd_soc_dai *dai)
{
struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_dai_get_drvdata(dai);
+ int stream = substream->stream;
- if (i2s_tdm->substreams[substream->stream])
+ if (i2s_tdm->substreams[stream])
return -EBUSY;
- i2s_tdm->substreams[substream->stream] = substream;
+ if (i2s_tdm->wait_time[stream])
+ substream->wait_time = msecs_to_jiffies(i2s_tdm->wait_time[stream]);
+
+ i2s_tdm->substreams[stream] = substream;
return 0;
}
@@ -1575,6 +2148,7 @@
.startup = rockchip_i2s_tdm_startup,
.shutdown = rockchip_i2s_tdm_shutdown,
.hw_params = rockchip_i2s_tdm_hw_params,
+ .hw_free = rockchip_i2s_tdm_hw_free,
.set_sysclk = rockchip_i2s_tdm_set_sysclk,
.set_fmt = rockchip_i2s_tdm_set_fmt,
.set_tdm_slot = rockchip_dai_tdm_slot,
@@ -1789,6 +2363,12 @@
#ifdef CONFIG_CPU_RK3568
{ .compatible = "rockchip,rk3568-i2s-tdm", .data = &rk3568_i2s_soc_data },
#endif
+#ifdef CONFIG_CPU_RK3588
+ { .compatible = "rockchip,rk3588-i2s-tdm", },
+#endif
+#ifdef CONFIG_CPU_RV1106
+ { .compatible = "rockchip,rv1106-i2s-tdm", },
+#endif
#ifdef CONFIG_CPU_RV1126
{ .compatible = "rockchip,rv1126-i2s-tdm", .data = &rv1126_i2s_soc_data },
#endif
@@ -1823,7 +2403,7 @@
.playback = {
.stream_name = "Playback",
.channels_min = 2,
- .channels_max = 16,
+ .channels_max = 64,
.rates = SNDRV_PCM_RATE_8000_192000,
.formats = (SNDRV_PCM_FMTBIT_S8 |
SNDRV_PCM_FMTBIT_S16_LE |
@@ -1835,7 +2415,7 @@
.capture = {
.stream_name = "Capture",
.channels_min = 2,
- .channels_max = 16,
+ .channels_max = 64,
.rates = SNDRV_PCM_RATE_8000_192000,
.formats = (SNDRV_PCM_FMTBIT_S8 |
SNDRV_PCM_FMTBIT_S16_LE |
@@ -1998,6 +2578,29 @@
return rockchip_i2s_tdm_path_prepare(i2s_tdm, np, 1);
}
+static int rockchip_i2s_tdm_get_fifo_count(struct device *dev,
+ struct snd_pcm_substream *substream)
+{
+ struct rk_i2s_tdm_dev *i2s_tdm = dev_get_drvdata(dev);
+ int val = 0;
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ regmap_read(i2s_tdm->regmap, I2S_TXFIFOLR, &val);
+ else
+ regmap_read(i2s_tdm->regmap, I2S_RXFIFOLR, &val);
+
+ val = ((val & I2S_FIFOLR_TFL3_MASK) >> I2S_FIFOLR_TFL3_SHIFT) +
+ ((val & I2S_FIFOLR_TFL2_MASK) >> I2S_FIFOLR_TFL2_SHIFT) +
+ ((val & I2S_FIFOLR_TFL1_MASK) >> I2S_FIFOLR_TFL1_SHIFT) +
+ ((val & I2S_FIFOLR_TFL0_MASK) >> I2S_FIFOLR_TFL0_SHIFT);
+
+ return val;
+}
+
+static const struct snd_dlp_config dconfig = {
+ .get_fifo_count = rockchip_i2s_tdm_get_fifo_count,
+};
+
static irqreturn_t rockchip_i2s_tdm_isr(int irq, void *devid)
{
struct rk_i2s_tdm_dev *i2s_tdm = (struct rk_i2s_tdm_dev *)devid;
@@ -2009,6 +2612,9 @@
dev_warn_ratelimited(i2s_tdm->dev, "TX FIFO Underrun\n");
regmap_update_bits(i2s_tdm->regmap, I2S_INTCR,
I2S_INTCR_TXUIC, I2S_INTCR_TXUIC);
+ regmap_update_bits(i2s_tdm->regmap, I2S_INTCR,
+ I2S_INTCR_TXUIE_MASK,
+ I2S_INTCR_TXUIE(0));
substream = i2s_tdm->substreams[SNDRV_PCM_STREAM_PLAYBACK];
if (substream)
snd_pcm_stop_xrun(substream);
@@ -2018,12 +2624,76 @@
dev_warn_ratelimited(i2s_tdm->dev, "RX FIFO Overrun\n");
regmap_update_bits(i2s_tdm->regmap, I2S_INTCR,
I2S_INTCR_RXOIC, I2S_INTCR_RXOIC);
+ regmap_update_bits(i2s_tdm->regmap, I2S_INTCR,
+ I2S_INTCR_RXOIE_MASK,
+ I2S_INTCR_RXOIE(0));
substream = i2s_tdm->substreams[SNDRV_PCM_STREAM_CAPTURE];
if (substream)
snd_pcm_stop_xrun(substream);
}
return IRQ_HANDLED;
+}
+
+static int rockchip_i2s_tdm_keep_clk_always_on(struct rk_i2s_tdm_dev *i2s_tdm)
+{
+ unsigned int mclk_rate = DEFAULT_FS * DEFAULT_MCLK_FS;
+ unsigned int bclk_rate = i2s_tdm->bclk_fs * DEFAULT_FS;
+ unsigned int div_lrck = i2s_tdm->bclk_fs;
+ unsigned int div_bclk;
+ int ret;
+
+ div_bclk = DIV_ROUND_CLOSEST(mclk_rate, bclk_rate);
+
+ /* assign generic freq */
+ clk_set_rate(i2s_tdm->mclk_rx, mclk_rate);
+ clk_set_rate(i2s_tdm->mclk_tx, mclk_rate);
+
+ ret = rockchip_i2s_tdm_mclk_reparent(i2s_tdm);
+ if (ret)
+ return ret;
+
+ regmap_update_bits(i2s_tdm->regmap, I2S_CLKDIV,
+ I2S_CLKDIV_RXM_MASK | I2S_CLKDIV_TXM_MASK,
+ I2S_CLKDIV_RXM(div_bclk) | I2S_CLKDIV_TXM(div_bclk));
+ regmap_update_bits(i2s_tdm->regmap, I2S_CKR,
+ I2S_CKR_RSD_MASK | I2S_CKR_TSD_MASK,
+ I2S_CKR_RSD(div_lrck) | I2S_CKR_TSD(div_lrck));
+
+ if (i2s_tdm->clk_trcm)
+ rockchip_i2s_tdm_xfer_trcm_start(i2s_tdm);
+ else
+ rockchip_i2s_tdm_xfer_start(i2s_tdm, SNDRV_PCM_STREAM_PLAYBACK);
+
+ pm_runtime_forbid(i2s_tdm->dev);
+
+ dev_info(i2s_tdm->dev, "CLK-ALWAYS-ON: mclk: %d, bclk: %d, fsync: %d\n",
+ mclk_rate, bclk_rate, DEFAULT_FS);
+
+ return 0;
+}
+
+static int rockchip_i2s_tdm_register_platform(struct device *dev)
+{
+ int ret = 0;
+
+ if (device_property_read_bool(dev, "rockchip,no-dmaengine")) {
+ dev_info(dev, "Used for Multi-DAI\n");
+ return 0;
+ }
+
+ if (device_property_read_bool(dev, "rockchip,digital-loopback")) {
+ ret = devm_snd_dmaengine_dlp_register(dev, &dconfig);
+ if (ret)
+ dev_err(dev, "Could not register DLP\n");
+ return ret;
+ }
+
+ ret = devm_snd_dmaengine_pcm_register(dev, NULL, 0);
+ if (ret)
+ dev_err(dev, "Could not register PCM\n");
+
+ return ret;
}
static int rockchip_i2s_tdm_probe(struct platform_device *pdev)
@@ -2048,10 +2718,63 @@
return -ENOMEM;
i2s_tdm->dev = &pdev->dev;
+ i2s_tdm->lrck_ratio = 1;
of_id = of_match_device(rockchip_i2s_tdm_match, &pdev->dev);
- if (!of_id || !of_id->data)
+ if (!of_id)
return -EINVAL;
+
+#ifdef CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES
+ i2s_tdm->is_tdm_multi_lanes =
+ device_property_read_bool(i2s_tdm->dev, "rockchip,tdm-multi-lanes");
+
+ if (i2s_tdm->is_tdm_multi_lanes) {
+ struct device_node *clk_src_node = NULL;
+
+ i2s_tdm->tx_lanes = 1;
+ i2s_tdm->rx_lanes = 1;
+
+ if (!device_property_read_u32(i2s_tdm->dev, "rockchip,tdm-tx-lanes", &val)) {
+ if ((val >= 1) && (val <= 4))
+ i2s_tdm->tx_lanes = val;
+ }
+
+ if (!device_property_read_u32(i2s_tdm->dev, "rockchip,tdm-rx-lanes", &val)) {
+ if ((val >= 1) && (val <= 4))
+ i2s_tdm->rx_lanes = val;
+ }
+
+ i2s_tdm->i2s_lrck_gpio = devm_gpiod_get_optional(&pdev->dev, "i2s-lrck", GPIOD_IN);
+ if (IS_ERR(i2s_tdm->i2s_lrck_gpio)) {
+ ret = PTR_ERR(i2s_tdm->i2s_lrck_gpio);
+ dev_err(&pdev->dev, "Failed to get i2s_lrck_gpio %d\n", ret);
+ return ret;
+ }
+
+ i2s_tdm->tdm_fsync_gpio = devm_gpiod_get_optional(&pdev->dev, "tdm-fsync", GPIOD_IN);
+ if (IS_ERR(i2s_tdm->tdm_fsync_gpio)) {
+ ret = PTR_ERR(i2s_tdm->tdm_fsync_gpio);
+ dev_err(&pdev->dev, "Failed to get tdm_fsync_gpio %d\n", ret);
+ return ret;
+ }
+
+ /* It's optional, required when use soc clk src, such as: i2s2_2ch */
+ clk_src_node = of_parse_phandle(node, "rockchip,clk-src", 0);
+ if (clk_src_node) {
+ i2s_tdm->clk_src_base = of_iomap(clk_src_node, 0);
+ if (!i2s_tdm->clk_src_base)
+ return -ENOENT;
+
+ i2s_tdm->clk_src_dai = rockchip_i2s_tdm_find_dai(clk_src_node);
+ if (!i2s_tdm->clk_src_dai)
+ return -EPROBE_DEFER;
+
+ pm_runtime_forbid(i2s_tdm->clk_src_dai->dev);
+ }
+
+ dev_info(&pdev->dev, "Used as TDM_MULTI_LANES mode\n");
+ }
+#endif
spin_lock_init(&i2s_tdm->lock);
i2s_tdm->soc_data = (const struct rk_i2s_soc_data *)of_id->data;
@@ -2084,6 +2807,15 @@
soc_dai->playback.channels_min = 0;
i2s_tdm->grf = syscon_regmap_lookup_by_phandle(node, "rockchip,grf");
+
+ i2s_tdm->pinctrl = devm_pinctrl_get(&pdev->dev);
+ if (!IS_ERR_OR_NULL(i2s_tdm->pinctrl)) {
+ i2s_tdm->clk_state = pinctrl_lookup_state(i2s_tdm->pinctrl, "clk");
+ if (IS_ERR(i2s_tdm->clk_state)) {
+ i2s_tdm->clk_state = NULL;
+ dev_dbg(i2s_tdm->dev, "Have no clk pinctrl state\n");
+ }
+ }
#ifdef HAVE_SYNC_RESET
sync = of_device_is_compatible(node, "rockchip,px30-i2s-tdm") ||
@@ -2170,7 +2902,7 @@
if (IS_ERR(i2s_tdm->regmap))
return PTR_ERR(i2s_tdm->regmap);
- irq = platform_get_irq(pdev, 0);
+ irq = platform_get_irq_optional(pdev, 0);
if (irq > 0) {
ret = devm_request_irq(&pdev->dev, irq, rockchip_i2s_tdm_isr,
IRQF_SHARED, node->name, i2s_tdm);
@@ -2203,43 +2935,6 @@
atomic_set(&i2s_tdm->refcount, 0);
dev_set_drvdata(&pdev->dev, i2s_tdm);
- pm_runtime_enable(&pdev->dev);
- if (!pm_runtime_enabled(&pdev->dev)) {
- ret = i2s_tdm_runtime_resume(&pdev->dev);
- if (ret)
- goto err_pm_disable;
- }
-
- if (i2s_tdm->quirks & QUIRK_ALWAYS_ON) {
- unsigned int rate = DEFAULT_FS * DEFAULT_MCLK_FS;
- unsigned int div_bclk = DEFAULT_FS * DEFAULT_MCLK_FS;
- unsigned int div_lrck = i2s_tdm->bclk_fs;
-
- div_bclk = DIV_ROUND_CLOSEST(rate, div_lrck * DEFAULT_FS);
-
- /* assign generic freq */
- clk_set_rate(i2s_tdm->mclk_rx, rate);
- clk_set_rate(i2s_tdm->mclk_tx, rate);
-
- ret = rockchip_i2s_tdm_mclk_reparent(i2s_tdm);
- if (ret)
- goto err_pm_disable;
-
- regmap_update_bits(i2s_tdm->regmap, I2S_CLKDIV,
- I2S_CLKDIV_RXM_MASK | I2S_CLKDIV_TXM_MASK,
- I2S_CLKDIV_RXM(div_bclk) | I2S_CLKDIV_TXM(div_bclk));
- regmap_update_bits(i2s_tdm->regmap, I2S_CKR,
- I2S_CKR_RSD_MASK | I2S_CKR_TSD_MASK,
- I2S_CKR_RSD(div_lrck) | I2S_CKR_TSD(div_lrck));
-
- if (i2s_tdm->clk_trcm)
- rockchip_i2s_tdm_xfer_trcm_start(i2s_tdm);
- else
- rockchip_i2s_tdm_xfer_start(i2s_tdm, SNDRV_PCM_STREAM_PLAYBACK);
-
- pm_runtime_forbid(&pdev->dev);
- }
-
regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, I2S_DMACR_TDL_MASK,
I2S_DMACR_TDL(16));
regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, I2S_DMACR_RDL_MASK,
@@ -2250,24 +2945,44 @@
if (i2s_tdm->soc_data && i2s_tdm->soc_data->init)
i2s_tdm->soc_data->init(&pdev->dev, res->start);
+ /*
+ * CLK_ALWAYS_ON should be placed after all registers write done,
+ * because this situation will enable XFER bit which will make
+ * some registers(depend on XFER) write failed.
+ */
+ if (i2s_tdm->quirks & QUIRK_ALWAYS_ON) {
+ ret = rockchip_i2s_tdm_keep_clk_always_on(i2s_tdm);
+ if (ret)
+ return ret;
+ }
+
+ /*
+ * MUST: after pm_runtime_enable step, any register R/W
+ * should be wrapped with pm_runtime_get_sync/put.
+ *
+ * Another approach is to enable the regcache true to
+ * avoid access HW registers.
+ *
+ * Alternatively, performing the registers R/W before
+ * pm_runtime_enable is also a good option.
+ */
+ pm_runtime_enable(&pdev->dev);
+ if (!pm_runtime_enabled(&pdev->dev)) {
+ ret = i2s_tdm_runtime_resume(&pdev->dev);
+ if (ret)
+ goto err_pm_disable;
+ }
+
+ ret = rockchip_i2s_tdm_register_platform(&pdev->dev);
+ if (ret)
+ goto err_suspend;
+
ret = devm_snd_soc_register_component(&pdev->dev,
&rockchip_i2s_tdm_component,
soc_dai, 1);
-
if (ret) {
dev_err(&pdev->dev, "Could not register DAI\n");
goto err_suspend;
- }
-
- if (of_property_read_bool(node, "rockchip,no-dmaengine")) {
- dev_info(&pdev->dev, "Used for Multi-DAI\n");
- return 0;
- }
-
- ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
- if (ret) {
- dev_err(&pdev->dev, "Could not register PCM\n");
- return ret;
}
return 0;
--
Gitblit v1.6.2