aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:50:19 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:50:19 -0400
commitdf6d3916f3b7b7e2067567a256dd4f0c1ea854a2 (patch)
tree0fdeab1ab5d566605fc99aeb5ea3f621f11e7608 /sound
parent74add80cbd7fe246c893b93ee75ac59acdd01dd4 (diff)
parent197686dfe0038fd190326d118b743ff65ad20c0e (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits) [POWERPC] Abolish powerpc_flash_init() [POWERPC] Early serial debug support for PPC44x [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc [POWERPC] Add device tree for Ebony [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now [POWERPC] MPIC U3/U4 MSI backend [POWERPC] MPIC MSI allocator [POWERPC] Enable MSI mappings for MPIC [POWERPC] Tell Phyp we support MSI [POWERPC] RTAS MSI implementation [POWERPC] PowerPC MSI infrastructure [POWERPC] Rip out the existing powerpc msi stubs [POWERPC] Remove use of 4level-fixup.h for ppc32 [POWERPC] Add powerpc PCI-E reset API implementation [POWERPC] Holly bootwrapper [POWERPC] Holly DTS [POWERPC] Holly defconfig [POWERPC] Add support for 750CL Holly board [POWERPC] Generalize tsi108 PCI setup [POWERPC] Generalize tsi108 PHY types ... Fixed conflict in include/asm-powerpc/kdebug.h manually Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/aoa/codecs/snd-aoa-codec-onyx.c4
-rw-r--r--sound/aoa/codecs/snd-aoa-codec-tas.c2
-rw-r--r--sound/aoa/soundbus/i2sbus/i2sbus-core.c4
-rw-r--r--sound/oss/dmasound/dmasound_awacs.c16
-rw-r--r--sound/ppc/pmac.c14
-rw-r--r--sound/ppc/tumbler.c2
6 files changed, 21 insertions, 21 deletions
diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.c b/sound/aoa/codecs/snd-aoa-codec-onyx.c
index 7f980be5d060..e91f9f66f395 100644
--- a/sound/aoa/codecs/snd-aoa-codec-onyx.c
+++ b/sound/aoa/codecs/snd-aoa-codec-onyx.c
@@ -1061,7 +1061,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter)
1061 busnode = pmac_i2c_get_bus_node(bus); 1061 busnode = pmac_i2c_get_bus_node(bus);
1062 1062
1063 while ((dev = of_get_next_child(busnode, dev)) != NULL) { 1063 while ((dev = of_get_next_child(busnode, dev)) != NULL) {
1064 if (device_is_compatible(dev, "pcm3052")) { 1064 if (of_device_is_compatible(dev, "pcm3052")) {
1065 const u32 *addr; 1065 const u32 *addr;
1066 printk(KERN_DEBUG PFX "found pcm3052\n"); 1066 printk(KERN_DEBUG PFX "found pcm3052\n");
1067 addr = of_get_property(dev, "reg", NULL); 1067 addr = of_get_property(dev, "reg", NULL);
@@ -1074,7 +1074,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter)
1074 /* if that didn't work, try desperate mode for older 1074 /* if that didn't work, try desperate mode for older
1075 * machines that have stuff missing from the device tree */ 1075 * machines that have stuff missing from the device tree */
1076 1076
1077 if (!device_is_compatible(busnode, "k2-i2c")) 1077 if (!of_device_is_compatible(busnode, "k2-i2c"))
1078 return -ENODEV; 1078 return -ENODEV;
1079 1079
1080 printk(KERN_DEBUG PFX "found k2-i2c, checking if onyx chip is on it\n"); 1080 printk(KERN_DEBUG PFX "found k2-i2c, checking if onyx chip is on it\n");
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c
index ceca38486eae..041fe52cbf29 100644
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c
+++ b/sound/aoa/codecs/snd-aoa-codec-tas.c
@@ -938,7 +938,7 @@ static int tas_i2c_attach(struct i2c_adapter *adapter)
938 busnode = pmac_i2c_get_bus_node(bus); 938 busnode = pmac_i2c_get_bus_node(bus);
939 939
940 while ((dev = of_get_next_child(busnode, dev)) != NULL) { 940 while ((dev = of_get_next_child(busnode, dev)) != NULL) {
941 if (device_is_compatible(dev, "tas3004")) { 941 if (of_device_is_compatible(dev, "tas3004")) {
942 const u32 *addr; 942 const u32 *addr;
943 printk(KERN_DEBUG PFX "found tas3004\n"); 943 printk(KERN_DEBUG PFX "found tas3004\n");
944 addr = of_get_property(dev, "reg", NULL); 944 addr = of_get_property(dev, "reg", NULL);
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index 79fc4bc09e5e..0fccdbf51663 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -336,8 +336,8 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match)
336 } 336 }
337 337
338 while ((np = of_get_next_child(dev->ofdev.node, np))) { 338 while ((np = of_get_next_child(dev->ofdev.node, np))) {
339 if (device_is_compatible(np, "i2sbus") || 339 if (of_device_is_compatible(np, "i2sbus") ||
340 device_is_compatible(np, "i2s-modem")) { 340 of_device_is_compatible(np, "i2s-modem")) {
341 got += i2sbus_add_dev(dev, control, np); 341 got += i2sbus_add_dev(dev, control, np);
342 } 342 }
343 } 343 }
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index 730fa1d001a5..8f6388004f44 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -362,7 +362,7 @@ setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int*
362 of_get_property(np,"audio-gpio",NULL); 362 of_get_property(np,"audio-gpio",NULL);
363 if (property != 0 && strcmp(property,name) == 0) 363 if (property != 0 && strcmp(property,name) == 0)
364 break; 364 break;
365 } else if (compatible && device_is_compatible(np, compatible)) 365 } else if (compatible && of_device_is_compatible(np, compatible))
366 break; 366 break;
367 np = of_get_next_child(gpiop, np); 367 np = of_get_next_child(gpiop, np);
368 } 368 }
@@ -2620,17 +2620,17 @@ get_codec_type(struct device_node *info)
2620 2620
2621 if (info) { 2621 if (info) {
2622 /* must do awacs first to allow screamer to overide it */ 2622 /* must do awacs first to allow screamer to overide it */
2623 if (device_is_compatible(info, "awacs")) 2623 if (of_device_is_compatible(info, "awacs"))
2624 codec = AWACS_AWACS ; 2624 codec = AWACS_AWACS ;
2625 if (device_is_compatible(info, "screamer")) 2625 if (of_device_is_compatible(info, "screamer"))
2626 codec = AWACS_SCREAMER; 2626 codec = AWACS_SCREAMER;
2627 if (device_is_compatible(info, "burgundy")) 2627 if (of_device_is_compatible(info, "burgundy"))
2628 codec = AWACS_BURGUNDY ; 2628 codec = AWACS_BURGUNDY ;
2629 if (device_is_compatible(info, "daca")) 2629 if (of_device_is_compatible(info, "daca"))
2630 codec = AWACS_DACA; 2630 codec = AWACS_DACA;
2631 if (device_is_compatible(info, "tumbler")) 2631 if (of_device_is_compatible(info, "tumbler"))
2632 codec = AWACS_TUMBLER; 2632 codec = AWACS_TUMBLER;
2633 if (device_is_compatible(info, "snapper")) 2633 if (of_device_is_compatible(info, "snapper"))
2634 codec = AWACS_SNAPPER; 2634 codec = AWACS_SNAPPER;
2635 } 2635 }
2636 return codec ; 2636 return codec ;
@@ -2772,7 +2772,7 @@ set_hw_byteswap(struct device_node *io)
2772 2772
2773 for (mio = io->parent; mio ; mio = mio->parent) { 2773 for (mio = io->parent; mio ; mio = mio->parent) {
2774 if (strcmp(mio->name, "mac-io") == 0) { 2774 if (strcmp(mio->name, "mac-io") == 0) {
2775 if (device_is_compatible(mio, "Keylargo")) 2775 if (of_device_is_compatible(mio, "Keylargo"))
2776 kl = 1; 2776 kl = 1;
2777 break; 2777 break;
2778 } 2778 }
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 2bae9c1a2b54..5a2bef44a2f5 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -843,7 +843,7 @@ static void __init detect_byte_swap(struct snd_pmac *chip)
843 /* if seems that Keylargo can't byte-swap */ 843 /* if seems that Keylargo can't byte-swap */
844 for (mio = chip->node->parent; mio; mio = mio->parent) { 844 for (mio = chip->node->parent; mio; mio = mio->parent) {
845 if (strcmp(mio->name, "mac-io") == 0) { 845 if (strcmp(mio->name, "mac-io") == 0) {
846 if (device_is_compatible(mio, "Keylargo")) 846 if (of_device_is_compatible(mio, "Keylargo"))
847 chip->can_byte_swap = 0; 847 chip->can_byte_swap = 0;
848 break; 848 break;
849 } 849 }
@@ -910,7 +910,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
910 chip->node = of_find_node_by_name(NULL, "i2s-a"); 910 chip->node = of_find_node_by_name(NULL, "i2s-a");
911 if (chip->node && chip->node->parent && 911 if (chip->node && chip->node->parent &&
912 chip->node->parent->parent) { 912 chip->node->parent->parent) {
913 if (device_is_compatible(chip->node->parent->parent, 913 if (of_device_is_compatible(chip->node->parent->parent,
914 "K2-Keylargo")) 914 "K2-Keylargo"))
915 chip->is_k2 = 1; 915 chip->is_k2 = 1;
916 } 916 }
@@ -941,22 +941,22 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
941 return -ENODEV; 941 return -ENODEV;
942 } 942 }
943 /* This should be verified on older screamers */ 943 /* This should be verified on older screamers */
944 if (device_is_compatible(sound, "screamer")) { 944 if (of_device_is_compatible(sound, "screamer")) {
945 chip->model = PMAC_SCREAMER; 945 chip->model = PMAC_SCREAMER;
946 // chip->can_byte_swap = 0; /* FIXME: check this */ 946 // chip->can_byte_swap = 0; /* FIXME: check this */
947 } 947 }
948 if (device_is_compatible(sound, "burgundy")) { 948 if (of_device_is_compatible(sound, "burgundy")) {
949 chip->model = PMAC_BURGUNDY; 949 chip->model = PMAC_BURGUNDY;
950 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */ 950 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
951 } 951 }
952 if (device_is_compatible(sound, "daca")) { 952 if (of_device_is_compatible(sound, "daca")) {
953 chip->model = PMAC_DACA; 953 chip->model = PMAC_DACA;
954 chip->can_capture = 0; /* no capture */ 954 chip->can_capture = 0; /* no capture */
955 chip->can_duplex = 0; 955 chip->can_duplex = 0;
956 // chip->can_byte_swap = 0; /* FIXME: check this */ 956 // chip->can_byte_swap = 0; /* FIXME: check this */
957 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */ 957 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
958 } 958 }
959 if (device_is_compatible(sound, "tumbler")) { 959 if (of_device_is_compatible(sound, "tumbler")) {
960 chip->model = PMAC_TUMBLER; 960 chip->model = PMAC_TUMBLER;
961 chip->can_capture = 0; /* no capture */ 961 chip->can_capture = 0; /* no capture */
962 chip->can_duplex = 0; 962 chip->can_duplex = 0;
@@ -965,7 +965,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
965 chip->freq_table = tumbler_freqs; 965 chip->freq_table = tumbler_freqs;
966 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */ 966 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
967 } 967 }
968 if (device_is_compatible(sound, "snapper")) { 968 if (of_device_is_compatible(sound, "snapper")) {
969 chip->model = PMAC_SNAPPER; 969 chip->model = PMAC_SNAPPER;
970 // chip->can_byte_swap = 0; /* FIXME: check this */ 970 // chip->can_byte_swap = 0; /* FIXME: check this */
971 chip->num_freqs = ARRAY_SIZE(tumbler_freqs); 971 chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 54e333fbb1d0..5821cdd0bec9 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -1060,7 +1060,7 @@ static struct device_node *find_compatible_audio_device(const char *name)
1060 1060
1061 for (np = of_get_next_child(gpiop, NULL); np; 1061 for (np = of_get_next_child(gpiop, NULL); np;
1062 np = of_get_next_child(gpiop, np)) { 1062 np = of_get_next_child(gpiop, np)) {
1063 if (device_is_compatible(np, name)) 1063 if (of_device_is_compatible(np, name))
1064 break; 1064 break;
1065 } 1065 }
1066 of_node_put(gpiop); 1066 of_node_put(gpiop);