Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 371952
b: refs/heads/master
c: 06d7c13
h: refs/heads/master
v: v3
  • Loading branch information
Andrey Smirnov authored and Mark Brown committed Mar 4, 2013
1 parent 3360246 commit 3a53011
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d686500ae87275ed58a074f9e5e8b35b9afe30d8
refs/heads/master: 06d7c13325228a2272e21caa4aa60805bc4d0fe4
25 changes: 22 additions & 3 deletions trunk/sound/soc/codecs/si476x.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* sound/soc/codecs/si476x.c -- Codec driver for SI476X chips
*
* Copyright (C) 2012 Innovative Converged Devices(ICD)
* Copyright (C) 2013 Andrey Smirnov
*
* Author: Andrey Smirnov <andrew.smirnov@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
*/

#include <linux/module.h>
#include <linux/slab.h>
#include <sound/pcm.h>
Expand Down Expand Up @@ -156,7 +175,7 @@ static int si476x_codec_set_dai_fmt(struct snd_soc_dai *codec_dai,
dev_err(codec_dai->codec->dev, "Failed to set output format\n");
return err;
}

return 0;
}

Expand Down Expand Up @@ -197,7 +216,7 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream,

err = snd_soc_update_bits(dai->codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT,
SI476X_DIGITAL_IO_OUTPUT_WIDTH_MASK,
(width << SI476X_DIGITAL_IO_SLOT_SIZE_SHIFT) |
(width << SI476X_DIGITAL_IO_SLOT_SIZE_SHIFT) |
(width << SI476X_DIGITAL_IO_SAMPLE_SIZE_SHIFT));
if (err < 0) {
dev_err(dai->codec->dev, "Failed to set output width\n");
Expand Down Expand Up @@ -266,6 +285,6 @@ static struct platform_driver si476x_platform_driver = {
};
module_platform_driver(si476x_platform_driver);

MODULE_AUTHOR("Andrey Smirnov <andrey.smirnov@convergeddevices.net>");
MODULE_AUTHOR("Andrey Smirnov <andrew.smirnov@gmail.com>");
MODULE_DESCRIPTION("ASoC Si4761/64 codec driver");
MODULE_LICENSE("GPL");

0 comments on commit 3a53011

Please sign in to comment.