← 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/wm8728.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/wm8728.c
19
19
#include <linux/platform_device.h>
20
20
#include <linux/spi/spi.h>
21
21
#include <linux/slab.h>
 
22
#include <linux/of_device.h>
22
23
#include <sound/core.h>
23
24
#include <sound/pcm.h>
24
25
#include <sound/pcm_params.h>
269
270
        .num_dapm_routes = ARRAY_SIZE(wm8728_intercon),
270
271
};
271
272
 
 
273
static const struct of_device_id wm8728_of_match[] = {
 
274
        { .compatible = "wlf,wm8728", },
 
275
        { }
 
276
};
 
277
MODULE_DEVICE_TABLE(of, wm8728_of_match);
 
278
 
272
279
#if defined(CONFIG_SPI_MASTER)
273
280
static int __devinit wm8728_spi_probe(struct spi_device *spi)
274
281
{
298
305
 
299
306
static struct spi_driver wm8728_spi_driver = {
300
307
        .driver = {
301
 
                .name   = "wm8728-codec",
 
308
                .name   = "wm8728",
302
309
                .owner  = THIS_MODULE,
 
310
                .of_match_table = wm8728_of_match,
303
311
        },
304
312
        .probe          = wm8728_spi_probe,
305
313
        .remove         = __devexit_p(wm8728_spi_remove),
342
350
 
343
351
static struct i2c_driver wm8728_i2c_driver = {
344
352
        .driver = {
345
 
                .name = "wm8728-codec",
 
353
                .name = "wm8728",
346
354
                .owner = THIS_MODULE,
 
355
                .of_match_table = wm8728_of_match,
347
356
        },
348
357
        .probe =    wm8728_i2c_probe,
349
358
        .remove =   __devexit_p(wm8728_i2c_remove),