Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Additional updates for 3.6

A batch more bugfixes, all driver-specific and fairly small and
unremarkable in a global context.  The biggest batch are for the newly
added Arizona drivers.

1 files changed, 5 insertions, 0 deletions

diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
index 0c3c2fb0f939..fe8590cac5c2 100644
--- a/include/sound/tea575x-tuner.h
+++ b/include/sound/tea575x-tuner.h
@@ -37,6 +37,10 @@
 struct snd_tea575x;
 
 struct snd_tea575x_ops {
+        /* Drivers using snd_tea575x must either define read_ and write_val */
+        void (*write_val)(struct snd_tea575x *tea, u32 val);
+        u32 (*read_val)(struct snd_tea575x *tea);
+        /* Or define the 3 pin functions */
         void (*set_pins)(struct snd_tea575x *tea, u8 pins);
         u8 (*get_pins)(struct snd_tea575x *tea);
         void (*set_direction)(struct snd_tea575x *tea, bool output);
@@ -49,6 +53,7 @@ struct snd_tea575x {
         int radio_nr;                   /* radio_nr */
         bool tea5759;                   /* 5759 chip is present */
         bool cannot_read_data;          /* Device cannot read the data pin */
+        bool cannot_mute;               /* Device cannot mute */
         bool mute;                      /* Device is muted? */
         bool stereo;                    /* receiving stereo */
         bool tuned;                     /* tuned to a station */