Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3d9478b authored by Johannes Berg's avatar Johannes Berg Committed by Jaroslav Kysela
Browse files

[ALSA] snd-aoa: add snd-aoa 



This large patch adds all of snd-aoa.
Consisting of many modules, it currently replaces snd-powermac
for all layout-id based machines and handles many more (for
example new powerbooks and powermacs with digital output that
previously couldn't be used at all).
It also has support for all layout-IDs that Apple has (judging
from their Info.plist file) but not all are tested.
The driver currently has 2 known regressions over snd-powermac:
 * it doesn't handle powermac 7,2 and 7,3
 * it doesn't have a DRC control on snapper-based machines
I will fix those during the 2.6.18 development cycle.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 41f0cd3a

sound/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ source "sound/pci/Kconfig" 


source "sound/ppc/Kconfig"



source "sound/aoa/Kconfig"



source "sound/arm/Kconfig"



source "sound/mips/Kconfig"

sound/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
obj-$(CONFIG_SOUND) += soundcore.o

obj-$(CONFIG_SOUND_PRIME) += oss/

obj-$(CONFIG_DMASOUND) += oss/

obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/

obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ aoa/



ifeq ($(CONFIG_SND),y)

  obj-y += last.o

sound/aoa/Kconfig

0 → 100644
+17 −0
Original line number Diff line number Diff line 
menu "Apple Onboard Audio driver"

	depends on SND != n && PPC



config SND_AOA

	tristate "Apple Onboard Audio driver"

	depends on SOUND && SND_PCM

	---help---

	This option enables the new driver for the various

	Apple Onboard Audio components.



source "sound/aoa/fabrics/Kconfig"



source "sound/aoa/codecs/Kconfig"



source "sound/aoa/soundbus/Kconfig"



endmenu

sound/aoa/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_SND_AOA) += core/

obj-$(CONFIG_SND_AOA) += codecs/

obj-$(CONFIG_SND_AOA) += fabrics/

obj-$(CONFIG_SND_AOA_SOUNDBUS) += soundbus/

sound/aoa/aoa-gpio.h

0 → 100644
+81 −0
Original line number Diff line number Diff line 
/*

 * Apple Onboard Audio GPIO definitions

 *

 * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>

 *

 * GPL v2, can be found in COPYING.

 */



#ifndef __AOA_GPIO_H

#define __AOA_GPIO_H

#include <linux/workqueue.h>

#include <linux/mutex.h>

#include <asm/prom.h>



typedef void (*notify_func_t)(void *data);



enum notify_type {

	AOA_NOTIFY_HEADPHONE,

	AOA_NOTIFY_LINE_IN,

	AOA_NOTIFY_LINE_OUT,

};



struct gpio_runtime;

struct gpio_methods {

	/* for initialisation/de-initialisation of the GPIO layer */

	void (*init)(struct gpio_runtime *rt);

	void (*exit)(struct gpio_runtime *rt);



	/* turn off headphone, speakers, lineout */

	void (*all_amps_off)(struct gpio_runtime *rt);

	/* turn headphone, speakers, lineout back to previous setting */

	void (*all_amps_restore)(struct gpio_runtime *rt);



	void (*set_headphone)(struct gpio_runtime *rt, int on);

	void (*set_speakers)(struct gpio_runtime *rt, int on);

	void (*set_lineout)(struct gpio_runtime *rt, int on);



	int (*get_headphone)(struct gpio_runtime *rt);

	int (*get_speakers)(struct gpio_runtime *rt);

	int (*get_lineout)(struct gpio_runtime *rt);



	void (*set_hw_reset)(struct gpio_runtime *rt, int on);



	/* use this to be notified of any events. The notification

	 * function is passed the data, and is called in process

	 * context by the use of schedule_work.

	 * The interface for it is that setting a function to NULL

	 * removes it, and they return 0 if the operation succeeded,

	 * and -EBUSY if the notification is already assigned by

	 * someone else. */

	int (*set_notify)(struct gpio_runtime *rt,

			  enum notify_type type,

			  notify_func_t notify,

			  void *data);

	/* returns 0 if not plugged in, 1 if plugged in

	 * or a negative error code */

	int (*get_detect)(struct gpio_runtime *rt,

			  enum notify_type type);

};



struct gpio_notification {

	notify_func_t notify;

	void *data;

	void *gpio_private;

	struct work_struct work;

	struct mutex mutex;

};



struct gpio_runtime {

	/* to be assigned by fabric */

	struct device_node *node;

	/* since everyone needs this pointer anyway... */

	struct gpio_methods *methods;

	/* to be used by the gpio implementation */

	int implementation_private;

	struct gpio_notification headphone_notify;

	struct gpio_notification line_in_notify;

	struct gpio_notification line_out_notify;

};



#endif /* __AOA_GPIO_H */