Skip to contentSkip to conversation

ASoC: wm_adsp: Set ADSP1 clock rate to match sys clock

PATCH In review Chris Rattray 2 participants 3 messages Jan 17, 2013 – Jan 18, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ASoC: wm_adsp: Set ADSP1 clock rate to match sys clock

Sets the ADSP1 clock rate to match the system clock rate. To support this the codec driver provides details of register containing the system clock control bits.

---
 sound/soc/codecs/wm_adsp.c |   35 +++++++++++++++++++++++++++++++++++
 sound/soc/codecs/wm_adsp.h |    3 +++
 2 files changed, 38 insertions(+), 0 deletions(-)
sound/soc/codecs/wm_adsp.c +35 -0
index 9a3f220..739dab6 100644
@@ -75,6 +75,8 @@
 #define ADSP1_CONTROL_30                  0x24
 #define ADSP1_CONTROL_31                  0x26
 
+#define ADSP1_CLOCKING 38
+
 /*
  * ADSP1 Control 19
  */
@@ -103,6 +105,13 @@
 #define ADSP1_START_SHIFT                      0  /* DSP1_START */
 #define ADSP1_START_WIDTH                      1  /* DSP1_START */
 
+/*
+ * ADSP1 Control 31
+ */
+#define ADSP1_CLK_SEL_MASK                0x0007  /* CLK_SEL_ENA */
+#define ADSP1_CLK_SEL_SHIFT                    0  /* CLK_SEL_ENA */
+#define ADSP1_CLK_SEL_WIDTH                    3  /* CLK_SEL_ENA */
+
 #define ADSP2_CONTROL  0
 #define ADSP2_CLOCKING 1
 #define ADSP2_STATUS1  4
@@ -817,12 +826,38 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
 	struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);
 	struct wm_adsp *dsp = &dsps[w->shift];
 	int ret;
+	int val;
 
 	switch (event) {
 	case SND_SOC_DAPM_POST_PMU:
 		regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30,
 				   ADSP1_SYS_ENA, ADSP1_SYS_ENA);
 
+		/*
+		 * For simplicity set the DSP clock rate to be the
+		 * SYSCLK rate rather than making it configurable.
+		 */
+		if(dsp->sysclk_reg) {
+			ret = regmap_read(dsp->regmap, dsp->sysclk_reg, &val);
+			if (ret != 0) {
+				adsp_err(dsp, "Failed to read SYSCLK state: %d\n",
+				ret);
+				return ret;
+			}
+
+			val = (val & dsp->sysclk_mask)
+				>> dsp->sysclk_shift;
+
+			ret = regmap_update_bits(dsp->regmap,
+						 dsp->base + ADSP1_CLOCKING,
+						 ADSP1_CLK_SEL_MASK, val);
+			if (ret != 0) {
+				adsp_err(dsp, "Failed to set clock rate: %d\n",
+					 ret);
+				return ret;
+			}
+		}
+
 		ret = wm_adsp_load(dsp);
 		if (ret != 0)
 			goto err;
sound/soc/codecs/wm_adsp.h +3 -0
index 41206d7..cb8871a 100644
@@ -40,6 +40,9 @@ struct wm_adsp {
 	struct regmap *regmap;
 
 	int base;
+	int sysclk_reg;
+	int sysclk_mask;
+	int sysclk_shift;
 
 	struct list_head alg_regions;
 
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 2/2 ASoC: wm2200: Set system clock control register is adsp structs

Allows ADSP control code to set the dsp clock rate to match the sys clock rate.

---
 sound/soc/codecs/wm2200.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
sound/soc/codecs/wm2200.c +3 -0
index 5259ebd..0181444 100644
@@ -2205,6 +2205,9 @@ static int wm2200_i2c_probe(struct i2c_client *i2c,
 		wm2200->dsp[i].num = i + 1;
 		wm2200->dsp[i].dev = &i2c->dev;
 		wm2200->dsp[i].regmap = wm2200->regmap;
+		wm2200->dsp[i].sysclk_reg = WM2200_CLOCKING_3;
+		wm2200->dsp[i].sysclk_mask = WM2200_SYSCLK_FREQ_MASK;
+		wm2200->dsp[i].sysclk_shift =  WM2200_SYSCLK_FREQ_SHIFT;
 	}
 
 	wm2200->dsp[0].base = WM2200_DSP1_CONTROL_1;
Signature · 1 line
1.7.2.5
#2 lore raw
In reply to Chris Rattray

sound/soc/codecs/wm_adsp.c line 113

Quoted 11 lines · Chris Rattray

#define ADSP1_CONTROL_30 0x24
#define ADSP1_CONTROL_31 0x26

sound/soc/codecs/wm_adsp.c +7 -0
+#define ADSP1_CLOCKING 38
 
+/*
+ * ADSP1 Control 31
+ */
+#define ADSP1_CLK_SEL_MASK                0x0007  /* CLK_SEL_ENA */
+#define ADSP1_CLK_SEL_SHIFT                    0  /* CLK_SEL_ENA */
+#define ADSP1_CLK_SEL_WIDTH                    3  /* CLK_SEL_ENA */

You just called this ADSP1_CLOCKING above, using a different style to the other register #defines too (and of course there's already one for the helpfully named ADSP1 Control 31...).