shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rockchip: i2s-tdm: Add HAVE_SYNC_RESET config

Browse Source 
$ ./scripts/bloat-o-meter rockchip_i2s_tdm.o.old rockchip_i2s_tdm.o
add/remove: 0/2 grow/shrink: 0/3 up/down: 0/-948 (-948)
Function                                     old     new   delta
rockchip_i2s_tdm_hw_params                  2768    2760      -8
rockchip_i2s_tdm_trigger                    1232    1216     -16
of_i2s_resetid_get                           124       -    -124
rockchip_i2s_tdm_probe                      1676    1496    -180
rockchip_snd_xfer_sync_reset                 620       -    -620
Total: Before=12012, After=11064, chg -7.89%

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3cffc57ca5fe4271d4a2c9584383777871123f14
This commit is contained in:
Tao Huang
2021-08-30 16:58:52 +08:00
parent c63e6495a8
commit 05163ed048
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sound/soc/rockchip/rockchip_i2s_tdm.c
View File

@@ -31,6 +31,10 @@
#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
#define DEFAULT_MCLK_FS 256
#define CH_GRP_MAX 4 /* The max channel 8 / 2 */
#define MULTIPLEX_CH_MAX 10
@@ -79,7 +83,11 @@ struct rk_i2s_tdm_dev {
struct reset_control *tx_reset;
struct reset_control *rx_reset;
const struct rk_i2s_soc_data *soc_data;
#ifdef HAVE_SYNC_RESET
void __iomem *cru_base;
int tx_reset_id;
int rx_reset_id;
#endif
bool is_master_mode;
bool io_multiplex;
bool mclk_calibrate;
@@ -96,8 +104,6 @@ struct rk_i2s_tdm_dev {
unsigned int i2s_sdis[CH_GRP_MAX];
unsigned int i2s_sdos[CH_GRP_MAX];
int clk_ppm;
int tx_reset_id;
int rx_reset_id;
atomic_t refcount;
spinlock_t lock; /* xfer lock */
};
@@ -166,6 +172,7 @@ static inline struct rk_i2s_tdm_dev *to_info(struct snd_soc_dai *dai)
return snd_soc_dai_get_drvdata(dai);
}
#ifdef HAVE_SYNC_RESET
#if defined(CONFIG_ARM) && !defined(writeq)
static inline void __raw_writeq(u64 val, volatile void __iomem *addr)
{
@@ -297,6 +304,11 @@ static void rockchip_snd_xfer_sync_reset(struct rk_i2s_tdm_dev *i2s_tdm)
rockchip_snd_xfer_reset_deassert(i2s_tdm, tx_bank, tx_offset,
rx_bank, rx_offset);
}
#else
static inline void rockchip_snd_xfer_sync_reset(struct rk_i2s_tdm_dev *i2s_tdm)
{
}
#endif
/* only used when clk_trcm > 0 */
static void rockchip_snd_txrxctrl(struct snd_pcm_substream *substream,
@@ -1481,6 +1493,7 @@ static const struct of_device_id rockchip_i2s_tdm_match[] = {
{},
};
#ifdef HAVE_SYNC_RESET
static int of_i2s_resetid_get(struct device_node *node,
const char *id)
{
@@ -1498,6 +1511,7 @@ static int of_i2s_resetid_get(struct device_node *node,
return args.args[0];
}
#endif
static int rockchip_i2s_tdm_dai_prepare(struct platform_device *pdev,
struct snd_soc_dai_driver **soc_dai)
@@ -1683,13 +1697,14 @@ static int rockchip_i2s_tdm_rx_path_prepare(struct rk_i2s_tdm_dev *i2s_tdm,
static int rockchip_i2s_tdm_probe(struct platform_device *pdev)
{
struct device_node *node = pdev->dev.of_node;
struct device_node *cru_node;
const struct of_device_id *of_id;
struct rk_i2s_tdm_dev *i2s_tdm;
struct snd_soc_dai_driver *soc_dai;
struct resource *res;
void __iomem *regs;
#ifdef HAVE_SYNC_RESET
bool sync;
#endif
int ret;
int val;
@@ -1737,11 +1752,14 @@ static int rockchip_i2s_tdm_probe(struct platform_device *pdev)
if (IS_ERR(i2s_tdm->grf))
return PTR_ERR(i2s_tdm->grf);
#ifdef HAVE_SYNC_RESET
sync = of_device_is_compatible(node, "rockchip,px30-i2s-tdm") ||
of_device_is_compatible(node, "rockchip,rk1808-i2s-tdm") ||
of_device_is_compatible(node, "rockchip,rk3308-i2s-tdm");
if (i2s_tdm->clk_trcm && sync) {
struct device_node *cru_node;
cru_node = of_parse_phandle(node, "rockchip,cru", 0);
i2s_tdm->cru_base = of_iomap(cru_node, 0);
if (!i2s_tdm->cru_base)
@@ -1750,6 +1768,7 @@ static int rockchip_i2s_tdm_probe(struct platform_device *pdev)
i2s_tdm->tx_reset_id = of_i2s_resetid_get(node, "tx-m");
i2s_tdm->rx_reset_id = of_i2s_resetid_get(node, "rx-m");
}
#endif
i2s_tdm->tx_reset = devm_reset_control_get(&pdev->dev, "tx-m");
if (IS_ERR(i2s_tdm->tx_reset)) {