From: Zheng Yang <zhengyang@rock-chips.com> Date: Mon, 30 Jul 2012 07:43:22 +0000 (+0800) Subject: rk2928: fix audio codec register operation error. X-Git-Tag: firefly_0821_release~8912^2~58 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=78c5e1c2bec66fd20a1f3cef8db2ffdd2982cc2a;p=firefly-linux-kernel-4.4.55.git rk2928: fix audio codec register operation error. --- diff --git a/sound/soc/codecs/rk2928_codec.c b/sound/soc/codecs/rk2928_codec.c index 57086b8ec237..e877ae2e6e73 100755 --- a/sound/soc/codecs/rk2928_codec.c +++ b/sound/soc/codecs/rk2928_codec.c @@ -79,13 +79,13 @@ void codec_set_spk(bool on) static unsigned int rk2928_read(struct snd_soc_codec *codec, unsigned int reg) { - return readl(rk2928_data.regbase + reg); + return readl(rk2928_data.regbase + reg*4); } static int rk2928_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) { DBG("%s reg 0x%02x value 0x%02x", __FUNCTION__, reg, value); - writel(value, rk2928_data.regbase + reg); + writel(value, rk2928_data.regbase + reg*4); return 0; } diff --git a/sound/soc/rk29/rk2928-card.c b/sound/soc/rk29/rk2928-card.c index 185d8ea1567d..8d08942bd86d 100755 --- a/sound/soc/rk29/rk2928-card.c +++ b/sound/soc/rk29/rk2928-card.c @@ -110,7 +110,7 @@ static struct snd_soc_dai_link rk2928_dai[] = { .stream_name = "RK2928", .cpu_dai_name = "rk29_i2s.0", .platform_name = "rockchip-audio", - .codec_name = "rk2928-codec.0-0001", + .codec_name = "rk2928-codec", .codec_dai_name = "rk2928-codec", .ops = &rk2928_dai_ops, },