aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Thomson <Adam.Thomson.Opensource@diasemi.com>2015-12-22 13:27:56 -0500
committerMark Brown <broonie@kernel.org>2015-12-22 19:12:00 -0500
commit501f72e9c5205b9d70d5d61e9b186ae7ba873f73 (patch)
tree3bb6fcc6e74fe4ce938bd8b8e5a7ee1cb474671f
parent0aed64c1766d354c819a13a57d8673adaf2266eb (diff)
ASoC: da7219: Remove support for 32KHz PLL mode
PLL mode based on 32KHz master clock not supported in AB silicon so remove support from the driver. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/da7219.c10
-rw-r--r--sound/soc/codecs/da7219.h2
2 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index 371768092e17..c6d3b32bb4ae 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -1074,11 +1074,8 @@ static int da7219_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
1074 u32 freq_ref; 1074 u32 freq_ref;
1075 u64 frac_div; 1075 u64 frac_div;
1076 1076
1077 /* Verify 32KHz, 2MHz - 54MHz MCLK provided, and set input divider */ 1077 /* Verify 2MHz - 54MHz MCLK provided, and set input divider */
1078 if (da7219->mclk_rate == 32768) { 1078 if (da7219->mclk_rate < 2000000) {
1079 indiv_bits = DA7219_PLL_INDIV_2_5_MHZ;
1080 indiv = DA7219_PLL_INDIV_2_5_MHZ_VAL;
1081 } else if (da7219->mclk_rate < 2000000) {
1082 dev_err(codec->dev, "PLL input clock %d below valid range\n", 1079 dev_err(codec->dev, "PLL input clock %d below valid range\n",
1083 da7219->mclk_rate); 1080 da7219->mclk_rate);
1084 return -EINVAL; 1081 return -EINVAL;
@@ -1119,9 +1116,6 @@ static int da7219_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
1119 case DA7219_SYSCLK_PLL_SRM: 1116 case DA7219_SYSCLK_PLL_SRM:
1120 pll_ctrl |= DA7219_PLL_MODE_SRM; 1117 pll_ctrl |= DA7219_PLL_MODE_SRM;
1121 break; 1118 break;
1122 case DA7219_SYSCLK_PLL_32KHZ:
1123 pll_ctrl |= DA7219_PLL_MODE_32KHZ;
1124 break;
1125 default: 1119 default:
1126 dev_err(codec->dev, "Invalid PLL config\n"); 1120 dev_err(codec->dev, "Invalid PLL config\n");
1127 return -EINVAL; 1121 return -EINVAL;
diff --git a/sound/soc/codecs/da7219.h b/sound/soc/codecs/da7219.h
index 2b3f4471a17f..5a787e738084 100644
--- a/sound/soc/codecs/da7219.h
+++ b/sound/soc/codecs/da7219.h
@@ -206,7 +206,6 @@
206#define DA7219_PLL_MODE_BYPASS (0x0 << 6) 206#define DA7219_PLL_MODE_BYPASS (0x0 << 6)
207#define DA7219_PLL_MODE_NORMAL (0x1 << 6) 207#define DA7219_PLL_MODE_NORMAL (0x1 << 6)
208#define DA7219_PLL_MODE_SRM (0x2 << 6) 208#define DA7219_PLL_MODE_SRM (0x2 << 6)
209#define DA7219_PLL_MODE_32KHZ (0x3 << 6)
210 209
211/* DA7219_PLL_FRAC_TOP = 0x22 */ 210/* DA7219_PLL_FRAC_TOP = 0x22 */
212#define DA7219_PLL_FBDIV_FRAC_TOP_SHIFT 0 211#define DA7219_PLL_FBDIV_FRAC_TOP_SHIFT 0
@@ -780,7 +779,6 @@ enum da7219_sys_clk {
780 DA7219_SYSCLK_MCLK = 0, 779 DA7219_SYSCLK_MCLK = 0,
781 DA7219_SYSCLK_PLL, 780 DA7219_SYSCLK_PLL,
782 DA7219_SYSCLK_PLL_SRM, 781 DA7219_SYSCLK_PLL_SRM,
783 DA7219_SYSCLK_PLL_32KHZ
784}; 782};
785 783
786/* Regulators */ 784/* Regulators */