projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8750', 'asoc/topic...
[cascardo/linux.git]
/
sound
/
soc
/
codecs
/
wm8995.c
diff --git
a/sound/soc/codecs/wm8995.c
b/sound/soc/codecs/wm8995.c
index
c280f0a
..
66103c2
100644
(file)
--- a/
sound/soc/codecs/wm8995.c
+++ b/
sound/soc/codecs/wm8995.c
@@
-44,7
+44,7
@@
static const char *wm8995_supply_names[WM8995_NUM_SUPPLIES] = {
"MICVDD"
};
"MICVDD"
};
-static struct reg_default wm8995_reg_defaults[] = {
+static
const
struct reg_default wm8995_reg_defaults[] = {
{ 0, 0x8995 },
{ 5, 0x0100 },
{ 16, 0x000b },
{ 0, 0x8995 },
{ 5, 0x0100 },
{ 16, 0x000b },
@@
-534,10
+534,11
@@
static void wm8995_update_class_w(struct snd_soc_codec *codec)
static int check_clk_sys(struct snd_soc_dapm_widget *source,
struct snd_soc_dapm_widget *sink)
{
static int check_clk_sys(struct snd_soc_dapm_widget *source,
struct snd_soc_dapm_widget *sink)
{
+ struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
unsigned int reg;
const char *clk;
unsigned int reg;
const char *clk;
- reg = snd_soc_read(
source->
codec, WM8995_CLOCKING_1);
+ reg = snd_soc_read(codec, WM8995_CLOCKING_1);
/* Check what we're currently using for CLK_SYS */
if (reg & WM8995_SYSCLK_SRC)
clk = "AIF2CLK";
/* Check what we're currently using for CLK_SYS */
if (reg & WM8995_SYSCLK_SRC)
clk = "AIF2CLK";
@@
-560,9
+561,7
@@
static int wm8995_put_class_w(struct snd_kcontrol *kcontrol,
static int hp_supply_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
static int hp_supply_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
- struct snd_soc_codec *codec;
-
- codec = w->codec;
+ struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
@@
-611,10
+610,9
@@
static void dc_servo_cmd(struct snd_soc_codec *codec,
static int hp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
static int hp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
- struct snd_soc_codec *codec;
+ struct snd_soc_codec *codec
= snd_soc_dapm_to_codec(w->dapm)
;
unsigned int reg;
unsigned int reg;
- codec = w->codec;
reg = snd_soc_read(codec, WM8995_ANALOGUE_HP_1);
switch (event) {
reg = snd_soc_read(codec, WM8995_ANALOGUE_HP_1);
switch (event) {
@@
-761,9
+759,7
@@
static int configure_clock(struct snd_soc_codec *codec)
static int clk_sys_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
static int clk_sys_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
- struct snd_soc_codec *codec;
-
- codec = w->codec;
+ struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
@@
-2190,7
+2186,7
@@
static struct snd_soc_dai_driver wm8995_dai[] = {
}
};
}
};
-static struct snd_soc_codec_driver soc_codec_dev_wm8995 = {
+static
const
struct snd_soc_codec_driver soc_codec_dev_wm8995 = {
.probe = wm8995_probe,
.remove = wm8995_remove,
.set_bias_level = wm8995_set_bias_level,
.probe = wm8995_probe,
.remove = wm8995_remove,
.set_bias_level = wm8995_set_bias_level,
@@
-2204,7
+2200,7
@@
static struct snd_soc_codec_driver soc_codec_dev_wm8995 = {
.num_dapm_routes = ARRAY_SIZE(wm8995_intercon),
};
.num_dapm_routes = ARRAY_SIZE(wm8995_intercon),
};
-static struct regmap_config wm8995_regmap = {
+static
const
struct regmap_config wm8995_regmap = {
.reg_bits = 16,
.val_bits = 16,
.reg_bits = 16,
.val_bits = 16,