Skip to content

Loopback mode kcontrol support #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xiulipan wants to merge 5 commits into from
Closed

Loopback mode kcontrol support #26

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e662282
dai: add lbm status for dai ssp
xiulipan Jun 13, 2018
71d3257
dai: add get_loopback_mode function
xiulipan Jun 19, 2018
f97f254
DMIC: add empty get_loopback_mode function
xiulipan Jun 19, 2018
5867e43
SSP: support for get/set_loopback_mode functions
xiulipan Jun 19, 2018
850d213
dai: add dai_cmd support for loopback mode switch
xiulipan Jun 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/drivers/apl-ssp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,16 +610,31 @@ static inline int ssp_set_loopback_mode(struct dai *dai, uint32_t lbm)
{
struct ssp_pdata *ssp = dai_get_drvdata(dai);

trace_ssp("loo");
spin_lock(&ssp->lock);
trace_ssp("los");

ssp_update_bits(dai, SSCR1, SSCR1_LBM, lbm ? SSCR1_LBM : 0);
if (ssp->lbm == lbm)
return 0;

spin_lock(&ssp->lock);
ssp->lbm = lbm;
ssp_update_bits(dai, SSCR1, SSCR1_LBM, lbm ? SSCR1_LBM : 0);
spin_unlock(&ssp->lock);

return 0;
}

static inline int ssp_get_loopback_mode(struct dai *dai)
{
struct ssp_pdata *ssp = dai_get_drvdata(dai);
int ret;

trace_ssp("log");
spin_lock(&ssp->lock);
ret = ssp->lbm;
spin_unlock(&ssp->lock);
return ret;
}

/* start the SSP for either playback or capture */
static void ssp_start(struct dai *dai, int direction)
{
Expand Down Expand Up @@ -757,4 +772,5 @@ const struct dai_ops ssp_ops = {
.pm_context_restore = ssp_context_restore,
.probe = ssp_probe,
.set_loopback_mode = ssp_set_loopback_mode,
.get_loopback_mode = ssp_get_loopback_mode,
};
22 changes: 19 additions & 3 deletions src/drivers/byt-ssp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,16 +457,31 @@ static inline int ssp_set_loopback_mode(struct dai *dai, uint32_t lbm)
{
struct ssp_pdata *ssp = dai_get_drvdata(dai);

trace_ssp("loo");
spin_lock(&ssp->lock);
trace_ssp("los");

ssp_update_bits(dai, SSCR1, SSCR1_LBM, lbm ? SSCR1_LBM : 0);
if (ssp->lbm == lbm)
return 0;

spin_lock(&ssp->lock);
ssp->lbm = lbm;
ssp_update_bits(dai, SSCR1, SSCR1_LBM, lbm ? SSCR1_LBM : 0);
spin_unlock(&ssp->lock);

return 0;
}

static inline int ssp_get_loopback_mode(struct dai *dai)
{
struct ssp_pdata *ssp = dai_get_drvdata(dai);
int ret;

trace_ssp("log");
spin_lock(&ssp->lock);
ret = ssp->lbm;
Copy link
Copy Markdown
Member

@lgirdwood lgirdwood Jun 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need this variable to track state ? cant we just use the SSP LBM bit for this ?

Copy link
Copy Markdown
Contributor Author

@xiulipan xiulipan Jun 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, will use the register value directly,

spin_unlock(&ssp->lock);
return ret;
}

/* start the SSP for either playback or capture */
static void ssp_start(struct dai *dai, int direction)
{
Expand Down Expand Up @@ -608,4 +623,5 @@ const struct dai_ops ssp_ops = {
.pm_context_restore = ssp_context_restore,
.probe = ssp_probe,
.set_loopback_mode = ssp_set_loopback_mode,
.get_loopback_mode = ssp_get_loopback_mode,
};
22 changes: 19 additions & 3 deletions src/drivers/hsw-ssp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,16 +370,31 @@ static inline int ssp_set_loopback_mode(struct dai *dai, uint32_t lbm)
{
struct ssp_pdata *ssp = dai_get_drvdata(dai);

trace_ssp("loo");
spin_lock(&ssp->lock);
trace_ssp("los");

ssp_update_bits(dai, SSCR1, SSCR1_LBM, lbm ? SSCR1_LBM : 0);
if (ssp->lbm == lbm)
return 0;

spin_lock(&ssp->lock);
ssp->lbm = lbm;
ssp_update_bits(dai, SSCR1, SSCR1_LBM, lbm ? SSCR1_LBM : 0);
spin_unlock(&ssp->lock);

return 0;
}

static inline int ssp_get_loopback_mode(struct dai *dai)
{
struct ssp_pdata *ssp = dai_get_drvdata(dai);
int ret;

trace_ssp("log");
spin_lock(&ssp->lock);
ret = ssp->lbm;
spin_unlock(&ssp->lock);
return ret;
}

/* start the SSP for either playback or capture */
static void ssp_start(struct dai *dai, int direction)
{
Expand Down Expand Up @@ -525,4 +540,5 @@ const struct dai_ops ssp_ops = {
.pm_context_restore = ssp_context_restore,
.probe = ssp_probe,
.set_loopback_mode = ssp_set_loopback_mode,
.get_loopback_mode = ssp_get_loopback_mode,
};