[alsa-devel] [PATCH 1/3] Add CHIP_ID as a readable register.
Reported-by: Zoltán Szenczi zoltan@raspberrypi.org Signed-off-by: Paul Handrigan Paul.Handrigan@cirrus.com --- sound/soc/codecs/cs4265.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index a20b30c..2dad15a 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -77,6 +77,7 @@ static bool cs4265_readable_register(struct device *dev, unsigned int reg) case CS4265_INT_MASK: case CS4265_STATUS_MODE_MSB: case CS4265_STATUS_MODE_LSB: + case CS4265_CHIP_ID: return true; default: return false;
Reported-by: Zoltán Szenczi zoltan@raspberrypi.org Signed-off-by: Paul Handrigan Paul.Handrigan@cirrus.com --- sound/soc/codecs/cs4265.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index 2dad15a..c31d29d 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -283,10 +283,10 @@ static const struct cs4265_clk_para clk_map_table[] = {
/*64k*/ {8192000, 64000, 1, 0}, - {1228800, 64000, 1, 1}, - {1693440, 64000, 1, 2}, - {2457600, 64000, 1, 3}, - {3276800, 64000, 1, 4}, + {12288000, 64000, 1, 1}, + {16934400, 64000, 1, 2}, + {24576000, 64000, 1, 3}, + {32768000, 64000, 1, 4},
/* 88.2k */ {11289600, 88200, 1, 0},
Reported-by: Zoltán Szenczi zoltan@raspberrypi.org Signed-off-by: Paul Handrigan Paul.Handrigan@cirrus.com --- sound/soc/codecs/cs4265.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index c31d29d..e299948 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -436,10 +436,10 @@ static int cs4265_pcm_hw_params(struct snd_pcm_substream *substream, index = cs4265_get_clk_index(cs4265->sysclk, params_rate(params)); if (index >= 0) { snd_soc_update_bits(codec, CS4265_ADC_CTL, - CS4265_ADC_FM, clk_map_table[index].fm_mode); + CS4265_ADC_FM, clk_map_table[index].fm_mode << 6); snd_soc_update_bits(codec, CS4265_MCLK_FREQ, CS4265_MCLK_FREQ_MASK, - clk_map_table[index].mclkdiv); + clk_map_table[index].mclkdiv << 4);
} else { dev_err(codec->dev, "can't get correct mclk\n");
On Thu, Aug 28, 2014 at 10:54:08AM -0500, Paul Handrigan wrote:
Reported-by: Zoltán Szenczi zoltan@raspberrypi.org Signed-off-by: Paul Handrigan Paul.Handrigan@cirrus.com
Applied all, thanks. Please use subject lines matching the style of the subsystem and try to keep the subject lines reasonably short so they can easily be displayed in logs and so on.
participants (2)
-
Mark Brown -
Paul Handrigan