Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Oder Chiou <oder_chiou@realtek.com>
To: broonie@kernel.org, lgirdwood@gmail.com
Cc: Oder Chiou <oder_chiou@realtek.com>,
	bardliao@realtek.com, alsa-devel@alsa-project.org,
	flove@realtek.com
Subject: [PATCH 3/6] ASoC: rt5640: Remove the unused or incorrect setting of clock source
Date: Fri, 28 Mar 2014 20:28:27 +0800	[thread overview]
Message-ID: <1396009710-21324-3-git-send-email-oder_chiou@realtek.com> (raw)
In-Reply-To: <1396009710-21324-1-git-send-email-oder_chiou@realtek.com>

The patch removes the unused or incorrect setting of clock source.

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
---
 sound/soc/codecs/rt5640.c | 8 +-------
 sound/soc/codecs/rt5640.h | 2 --
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 2afce49..096edfe 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -487,7 +487,7 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
 
 	val = snd_soc_read(source->codec, RT5640_GLB_CLK);
 	val &= RT5640_SCLK_SRC_MASK;
-	if (val == RT5640_SCLK_SRC_PLL1 || val == RT5640_SCLK_SRC_PLL1T)
+	if (val == RT5640_SCLK_SRC_PLL1)
 		return 1;
 	else
 		return 0;
@@ -1694,12 +1694,6 @@ static int rt5640_set_dai_sysclk(struct snd_soc_dai *dai,
 	case RT5640_SCLK_S_PLL1:
 		reg_val |= RT5640_SCLK_SRC_PLL1;
 		break;
-	case RT5640_SCLK_S_PLL1_TK:
-		reg_val |= RT5640_SCLK_SRC_PLL1T;
-		break;
-	case RT5640_SCLK_S_RCCLK:
-		reg_val |= RT5640_SCLK_SRC_RCCLK;
-		break;
 	default:
 		dev_err(codec->dev, "Invalid clock id (%d)\n", clk_id);
 		return -EINVAL;
diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h
index 5e8df25a..cbd07b5 100644
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
@@ -976,8 +976,6 @@
 #define RT5640_SCLK_SRC_SFT			14
 #define RT5640_SCLK_SRC_MCLK			(0x0 << 14)
 #define RT5640_SCLK_SRC_PLL1			(0x1 << 14)
-#define RT5640_SCLK_SRC_PLL1T			(0x2 << 14)
-#define RT5640_SCLK_SRC_RCCLK			(0x3 << 14) /* 15MHz */
 #define RT5640_PLL1_SRC_MASK			(0x3 << 12)
 #define RT5640_PLL1_SRC_SFT			12
 #define RT5640_PLL1_SRC_MCLK			(0x0 << 12)
-- 
1.8.1.1.439.g50a6b54

  parent reply	other threads:[~2014-03-28 12:29 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-28 12:28 [PATCH 1/6] ASoC: rt5640: Remove the pre-allocated size of reg_default Oder Chiou
2014-03-28 12:28 ` [PATCH 2/6] ASoC: rt5640: Rename the function of clock checking Oder Chiou
2014-03-28 12:53   ` Mark Brown
2014-03-28 12:28 ` Oder Chiou [this message]
2014-03-28 12:53   ` [PATCH 3/6] ASoC: rt5640: Remove the unused or incorrect setting of clock source Mark Brown
2014-03-28 12:28 ` [PATCH 4/6] ASoC: rt5640: Remove the unused field in private data Oder Chiou
2014-03-28 12:53   ` Mark Brown
2014-03-28 12:28 ` [PATCH 5/6] ASoC: rt5640: Remove the unnecessary parentheses Oder Chiou
2014-03-28 12:53   ` Mark Brown
2014-03-28 12:28 ` [PATCH 6/6] ASoC: rt5640: Change the setting method of idle_bias_off Oder Chiou
2014-03-28 12:54   ` Mark Brown
2014-03-31  2:24     ` [PATCH 6/6] ASoC: rt5640: Change the setting methodofidle_bias_off Oder Chiou
2014-03-28 12:52 ` [PATCH 1/6] ASoC: rt5640: Remove the pre-allocated size of reg_default Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1396009710-21324-3-git-send-email-oder_chiou@realtek.com \
    --to=oder_chiou@realtek.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=bardliao@realtek.com \
    --cc=broonie@kernel.org \
    --cc=flove@realtek.com \
    --cc=lgirdwood@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox