Skip to content

Commit

Permalink
drm/rockchip: cnd-dp: adjust spdif register setting
Browse files Browse the repository at this point in the history
We use jitter bypass mode for spdif, so do not need to set jitter mode
related bit in SPDIF_CTRL_ADDR register. But of course we need to keep
the SPDIF_ENABLE bit.

Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Lin Huang <hl@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1526979222-32478-1-git-send-email-hl@rock-chips.com
  • Loading branch information
Lin Huang authored and Heiko Stuebner committed Jun 16, 2018
1 parent ebfb081 commit 0baf5cc
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions drivers/gpu/drm/rockchip/cdn-dp-reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,6 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)

int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio)
{
u32 val;
int ret;

ret = cdn_dp_reg_write(dp, AUDIO_PACK_CONTROL, 0);
Expand All @@ -801,11 +800,7 @@ int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio)
return ret;
}

val = SPDIF_AVG_SEL | SPDIF_JITTER_BYPASS;
val |= SPDIF_FIFO_MID_RANGE(0xe0);
val |= SPDIF_JITTER_THRSH(0xe0);
val |= SPDIF_JITTER_AVG_WIN(7);
writel(val, dp->regs + SPDIF_CTRL_ADDR);
writel(0, dp->regs + SPDIF_CTRL_ADDR);

/* clearn the audio config and reset */
writel(0, dp->regs + AUDIO_SRC_CNTL);
Expand Down Expand Up @@ -929,22 +924,13 @@ static void cdn_dp_audio_config_spdif(struct cdn_dp_device *dp)
{
u32 val;

val = SPDIF_AVG_SEL | SPDIF_JITTER_BYPASS;
val |= SPDIF_FIFO_MID_RANGE(0xe0);
val |= SPDIF_JITTER_THRSH(0xe0);
val |= SPDIF_JITTER_AVG_WIN(7);
writel(val, dp->regs + SPDIF_CTRL_ADDR);

writel(SYNC_WR_TO_CH_ZERO, dp->regs + FIFO_CNTL);

val = MAX_NUM_CH(2) | AUDIO_TYPE_LPCM | CFG_SUB_PCKT_NUM(4);
writel(val, dp->regs + SMPL2PKT_CNFG);
writel(SMPL2PKT_EN, dp->regs + SMPL2PKT_CNTL);

val = SPDIF_ENABLE | SPDIF_AVG_SEL | SPDIF_JITTER_BYPASS;
val |= SPDIF_FIFO_MID_RANGE(0xe0);
val |= SPDIF_JITTER_THRSH(0xe0);
val |= SPDIF_JITTER_AVG_WIN(7);
writel(val, dp->regs + SPDIF_CTRL_ADDR);

clk_prepare_enable(dp->spdif_clk);
Expand Down

0 comments on commit 0baf5cc

Please sign in to comment.