aboutsummaryrefslogtreecommitdiffstats
path: root/sound/aoa/aoa-gpio.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-01-15 12:22:31 -0500
committerTakashi Iwai <tiwai@suse.de>2009-01-15 12:28:37 -0500
commit5f17e79cdf530b1a6090c65730e5656ac9c19eaa (patch)
tree4fd5886309ed84755e5c43096cd039850bef7525 /sound/aoa/aoa-gpio.h
parent45e513b689b8b0a01ec2b01cc21816e4780d7ea6 (diff)
ALSA: snd-aoa: handle master-amp if present
Some machines have a master amp GPIO that needs to be toggled to get sound output, in addition to speaker/headphone/line-out amps. This makes snd-aoa handle it, if present in the device tree, thus making snd-aoa be able to output sound on PowerMac3,6, which was previously handled by snd-powermac which also doesn't use the master amp GPIO. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/aoa/aoa-gpio.h')
-rw-r--r--sound/aoa/aoa-gpio.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/aoa/aoa-gpio.h b/sound/aoa/aoa-gpio.h
index ee64f5de8966..6065b0344e23 100644
--- a/sound/aoa/aoa-gpio.h
+++ b/sound/aoa/aoa-gpio.h
@@ -34,10 +34,12 @@ struct gpio_methods {
34 void (*set_headphone)(struct gpio_runtime *rt, int on); 34 void (*set_headphone)(struct gpio_runtime *rt, int on);
35 void (*set_speakers)(struct gpio_runtime *rt, int on); 35 void (*set_speakers)(struct gpio_runtime *rt, int on);
36 void (*set_lineout)(struct gpio_runtime *rt, int on); 36 void (*set_lineout)(struct gpio_runtime *rt, int on);
37 void (*set_master)(struct gpio_runtime *rt, int on);
37 38
38 int (*get_headphone)(struct gpio_runtime *rt); 39 int (*get_headphone)(struct gpio_runtime *rt);
39 int (*get_speakers)(struct gpio_runtime *rt); 40 int (*get_speakers)(struct gpio_runtime *rt);
40 int (*get_lineout)(struct gpio_runtime *rt); 41 int (*get_lineout)(struct gpio_runtime *rt);
42 int (*get_master)(struct gpio_runtime *rt);
41 43
42 void (*set_hw_reset)(struct gpio_runtime *rt, int on); 44 void (*set_hw_reset)(struct gpio_runtime *rt, int on);
43 45