commit 5f25a532cb29ca9090343b1fda8815f46be9b213
author Bo Hu <bohu@google.com> Tue Jun 02 22:55:31 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 02 22:55:31 2015 +0000
tree 041ff37fc4f2cdb17ea23353892548ba97e56db2
parent c1b2e02c8b566deaf0a591a48ff7fad66250b356
parent b509f134713abba397ef0ef509875001aed33667

Merge "target-mips: Add TLB Refill exception interpreter" into studio-master-dev

hw/mips/mips_ranchu.c

diff --git a/hw/mips/mips_ranchu.c b/hw/mips/mips_ranchu.c
index a6bad1d..981b22c 100644
--- a/hw/mips/mips_ranchu.c
+++ b/hw/mips/mips_ranchu.c
@@ -92,7 +92,7 @@
     [RANCHU_ANDROID_PIPE] = { GOLDFISH_IO_SPACE + 0x0A000, 0x2000, 10,
         "android_pipe", "android_pipe", "generic,android-pipe" },
     [RANCHU_GF_AUDIO] =     { GOLDFISH_IO_SPACE + 0x0C000, 0x0100, 11,
-        NULL, NULL, NULL },
+        "goldfish_audio", "goldfish_audio", "generic,goldfish-audio" },
     [RANCHU_MMIO] =         { GOLDFISH_IO_SPACE + 0x10000, 0x0200, 16,
         "virtio-mmio", "virtio_mmio", "virtio,mmio" },
     /* ...repeating for a total of VIRTIO_TRANSPORTS, each of that size */
@@ -475,7 +475,7 @@
     create_device(fdt, &devmap[RANCHU_GF_TTY], goldfish_pic, MAX_GF_TTYS, 0);
 
     /* Other Goldfish Platform devices */
-    for (i = RANCHU_ANDROID_PIPE; i >= RANCHU_GF_TIMER ; i--) {
+    for (i = RANCHU_GF_AUDIO; i >= RANCHU_GF_TIMER ; i--) {
         create_device(fdt, &devmap[i], goldfish_pic, 1, 0);
     }