At Thu, 15 Jan 2009 18:21:48 +0100,
Johannes Berg wrote:
>
> This patch changes snd-aoa to handle some older machines that are
> currently handled by snd-powermac. snd-aoa has a number of advantages
> though, notably it can autoload better and is generally a more modern
> driver.
>
> By hardcoding the accepted device-ids (last hunk of the patch) I'm
> trying to avoid regressions because this driver will otherwise load
> automatically and not let snd-powermac load. People who are unhappy
> with snd-powermac and have a device-id property in the device tree
> are encouraged to read this patch and make a patch to amend this as
> appropriate.
>
> Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Applied both patches now.
Thanks!
Takashi
> ---
> sound/aoa/fabrics/layout.c | 74 ++++++++++++++++++++++++++++++---------
> sound/aoa/soundbus/i2sbus/core.c | 22 ++++++++---
> 2 files changed, 74 insertions(+), 22 deletions(-)
>
> --- wireless-testing.orig/sound/aoa/fabrics/layout.c 2009-01-13 17:01:04.000000000 +0100
> +++ wireless-testing/sound/aoa/fabrics/layout.c 2009-01-15 18:15:28.000000000 +0100
> @@ -1,16 +1,14 @@
> /*
> - * Apple Onboard Audio driver -- layout fabric
> + * Apple Onboard Audio driver -- layout/machine id fabric
> *
> - * Copyright 2006 Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> + * Copyright 2006-2008 Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> *
> * GPL v2, can be found in COPYING.
> *
> *
> - * This fabric module looks for sound codecs
> - * based on the layout-id property in the device tree.
> - *
> + * This fabric module looks for sound codecs based on the
> + * layout-id or device-id property in the device tree.
> */
> -
> #include <asm/prom.h>
> #include <linux/list.h>
> #include <linux/module.h>
> @@ -63,7 +61,7 @@ struct codec_connect_info {
> #define LAYOUT_FLAG_COMBO_LINEOUT_SPDIF (1<<0)
>
> struct layout {
> - unsigned int layout_id;
> + unsigned int layout_id, device_id;
> struct codec_connect_info codecs[MAX_CODECS_PER_BUS];
> int flags;
>
> @@ -111,6 +109,10 @@ MODULE_ALIAS("sound-layout-96");
> MODULE_ALIAS("sound-layout-98");
> MODULE_ALIAS("sound-layout-100");
>
> +MODULE_ALIAS("aoa-device-id-14");
> +MODULE_ALIAS("aoa-device-id-22");
> +MODULE_ALIAS("aoa-device-id-35");
> +
> /* onyx with all but microphone connected */
> static struct codec_connection onyx_connections_nomic[] = {
> {
> @@ -518,6 +520,27 @@ static struct layout layouts[] = {
> .connections = onyx_connections_noheadphones,
> },
> },
> + /* PowerMac3,4 */
> + { .device_id = 14,
> + .codecs[0] = {
> + .name = "tas",
> + .connections = tas_connections_noline,
> + },
> + },
> + /* PowerMac3,6 */
> + { .device_id = 22,
> + .codecs[0] = {
> + .name = "tas",
> + .connections = tas_connections_all,
> + },
> + },
> + /* PowerBook5,2 */
> + { .device_id = 35,
> + .codecs[0] = {
> + .name = "tas",
> + .connections = tas_connections_all,
> + },
> + },
> {}
> };
>
> @@ -526,7 +549,7 @@ static struct layout *find_layout_by_id(
> struct layout *l;
>
> l = layouts;
> - while (l->layout_id) {
> + while (l->codecs[0].name) {
> if (l->layout_id == id)
> return l;
> l++;
> @@ -534,6 +557,19 @@ static struct layout *find_layout_by_id(
> return NULL;
> }
>
> +static struct layout *find_layout_by_device(unsigned int id)
> +{
> + struct layout *l;
> +
> + l = layouts;
> + while (l->codecs[0].name) {
> + if (l->device_id == id)
> + return l;
> + l++;
> + }
> + return NULL;
> +}
> +
> static void use_layout(struct layout *l)
> {
> int i;
> @@ -938,8 +974,8 @@ static struct aoa_fabric layout_fabric =
> static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
> {
> struct device_node *sound = NULL;
> - const unsigned int *layout_id;
> - struct layout *layout;
> + const unsigned int *id;
> + struct layout *layout = NULL;
> struct layout_dev *ldev = NULL;
> int err;
>
> @@ -952,15 +988,18 @@ static int aoa_fabric_layout_probe(struc
> if (sound->type && strcasecmp(sound->type, "soundchip") == 0)
> break;
> }
> - if (!sound) return -ENODEV;
> + if (!sound)
> + return -ENODEV;
>
> - layout_id = of_get_property(sound, "layout-id", NULL);
> - if (!layout_id)
> - goto outnodev;
> - printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n",
> - *layout_id);
> + id = of_get_property(sound, "layout-id", NULL);
> + if (id) {
> + layout = find_layout_by_id(*id);
> + } else {
> + id = of_get_property(sound, "device-id", NULL);
> + if (id)
> + layout = find_layout_by_device(*id);
> + }
>
> - layout = find_layout_by_id(*layout_id);
> if (!layout) {
> printk(KERN_ERR "snd-aoa-fabric-layout: unknown layout\n");
> goto outnodev;
> @@ -976,6 +1015,7 @@ static int aoa_fabric_layout_probe(struc
> ldev->layout = layout;
> ldev->gpio.node = sound->parent;
> switch (layout->layout_id) {
> + case 0: /* anything with device_id, not layout_id */
> case 41: /* that unknown machine no one seems to have */
> case 51: /* PowerBook5,4 */
> case 58: /* Mac Mini */
> --- wireless-testing.orig/sound/aoa/soundbus/i2sbus/core.c 2009-01-13 17:01:04.000000000 +0100
> +++ wireless-testing/sound/aoa/soundbus/i2sbus/core.c 2009-01-15 18:15:34.000000000 +0100
> @@ -1,7 +1,7 @@
> /*
> * i2sbus driver
> *
> - * Copyright 2006 Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> + * Copyright 2006-2008 Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> *
> * GPL v2, can be found in COPYING.
> */
> @@ -186,13 +186,25 @@ static int i2sbus_add_dev(struct macio_d
> }
> }
> if (i == 1) {
> - const u32 *layout_id =
> - of_get_property(sound, "layout-id", NULL);
> - if (layout_id) {
> - layout = *layout_id;
> + const u32 *id = of_get_property(sound, "layout-id", NULL);
> +
> + if (id) {
> + layout = *id;
> snprintf(dev->sound.modalias, 32,
> "sound-layout-%d", layout);
> ok = 1;
> + } else {
> + id = of_get_property(sound, "device-id", NULL);
> + /*
> + * We probably cannot handle all device-id machines,
> + * so restrict to those we do handle for now.
> + */
> + if (id && (*id == 22 || *id == 14 || *id == 35)) {
> + snprintf(dev->sound.modalias, 32,
> + "aoa-device-id-%d", *id);
> + ok = 1;
> + layout = -1;
> + }
> }
> }
> /* for the time being, until we can handle non-layout-id
>
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
