← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to sound/soc/codecs/wm8978.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/soc/codecs/wm8978.c
52
52
/* codec private data */
53
53
struct wm8978_priv {
54
54
        enum snd_soc_control_type control_type;
55
 
        void *control_data;
56
55
        unsigned int f_pllout;
57
56
        unsigned int f_mclk;
58
57
        unsigned int f_256fs;
955
954
         * default hardware setting
956
955
         */
957
956
        wm8978->sysclk = WM8978_PLL;
958
 
        codec->control_data = wm8978->control_data;
959
957
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_I2C);
960
958
        if (ret < 0) {
961
959
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
1016
1014
                return -ENOMEM;
1017
1015
 
1018
1016
        i2c_set_clientdata(i2c, wm8978);
1019
 
        wm8978->control_data = i2c;
1020
1017
 
1021
1018
        ret = snd_soc_register_codec(&i2c->dev,
1022
1019
                        &soc_codec_dev_wm8978, &wm8978_dai, 1);