Date:2010-06-01 00:45:39 (13 years 6 months ago)
Author:Lars C.
Commit:77993572f0ca7cf623cd36c061d54192f23d8d99
Message:jz4740: sound: Remove jzcodec set_sysclk callback.

There is nothing to be done here.
Files: sound/soc/codecs/jzcodec.c (2 diffs)
sound/soc/codecs/jzcodec.h (1 diff)
sound/soc/jz4740/n516.c (1 diff)
sound/soc/jz4740/n526.c (1 diff)
sound/soc/jz4740/qi_lb60.c (1 diff)

Change Details

sound/soc/codecs/jzcodec.c
11/*
2 * Copyright (C) 2009, Lars-Peter Clausen <lars@metafoo.de>
2 * Copyright (C) 2009-2010, Lars-Peter Clausen <lars@metafoo.de>
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License version 2 as
...... 
247247    return 0;
248248}
249249
250static int jz_codec_set_sysclk(struct snd_soc_dai *codec_dai,
251        int clk_id, unsigned int freq, int dir)
252{
253    return 0;
254}
255
256
257250static struct snd_soc_dai_ops jz_codec_dai_ops = {
258251    .hw_params = jz_codec_hw_params,
259252    .set_fmt = jz_codec_set_fmt,
260/* .set_clkdiv = jz_codec_set_clkdiv,*/
261    .set_sysclk = jz_codec_set_sysclk,
262253};
263254
264255struct snd_soc_dai jz_codec_dai = {
sound/soc/codecs/jzcodec.h
1414#ifndef _ICODEC_H
1515#define _ICODEC_H
1616
17#define JZCODEC_SYSCLK 0
18
1917extern struct snd_soc_dai jz_codec_dai;
2018extern struct snd_soc_codec_device soc_codec_dev_jzcodec;
2119
sound/soc/jz4740/n516.c
158158        return ret;
159159    }
160160
161    ret = snd_soc_dai_set_sysclk(codec_dai, JZCODEC_SYSCLK, 111,
162        SND_SOC_CLOCK_IN);
163    if (ret < 0) {
164        dev_err(codec->dev, "Failed to set codec dai sysclk: %d\n", ret);
165        return ret;
166    }
167
168161    ret = snd_soc_add_controls(codec, n516_controls,
169162        ARRAY_SIZE(n516_controls));
170163    if (ret) {
sound/soc/jz4740/n526.c
7878        return ret;
7979    }
8080
81    ret = snd_soc_dai_set_sysclk(codec_dai, JZCODEC_SYSCLK, 111,
82        SND_SOC_CLOCK_IN);
83    if (ret < 0) {
84        dev_err(codec->dev, "Failed to set codec dai sysclk: %d\n", ret);
85        return ret;
86    }
87
8881    snd_soc_dapm_new_controls(codec, n526_widgets, ARRAY_SIZE(n526_widgets));
8982
9083    snd_soc_add_controls(codec, n526_controls,
sound/soc/jz4740/qi_lb60.c
8181        return ret;
8282    }
8383
84    ret = snd_soc_dai_set_sysclk(codec_dai, JZCODEC_SYSCLK, 111,
85        SND_SOC_CLOCK_IN);
86    if (ret < 0) {
87        dev_err(codec->dev, "Failed to set codec dai sysclk: %d\n", ret);
88        return ret;
89    }
90
9184    snd_soc_dapm_new_controls(codec, qi_lb60_widgets, ARRAY_SIZE(qi_lb60_widgets));
9285
9386    snd_soc_dapm_add_routes(codec, qi_lb60_routes, ARRAY_SIZE(qi_lb60_routes));

Archive Download the corresponding diff file

Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master

Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9



interactive