From: Maria Shcherbina <m.shcherbina@samsung.com>
Date: Fri, 17 Aug 2012 13:54:49 +0000 (+0400)
Subject: ARM: Tizen: Add ac97 audio.
X-Git-Tag: TizenStudio_2.0_p2.3~1273^2~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83c481ef012207f583a0c56b133215810a953cc6;p=sdk%2Femulator%2Fqemu.git

ARM: Tizen: Add ac97 audio.
---

diff --git a/Makefile.target b/Makefile.target
index dabc0aa..755d21e 100755
--- a/Makefile.target
+++ b/Makefile.target
@@ -346,6 +346,7 @@ obj-arm-y += exynos4_boards.o exynos4210_uart.o exynos4210_pwm.o
 obj-arm-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o
 obj-arm-y += exynos4210_rtc.o exynos4210_cmu.o exynos4210_g3d.o
 obj-arm-y += exynos4210_i2c.o exynos4210_i2s.o exynos4210_audio.o
+obj-arm-y += ac97.o
 obj-arm-y += arm_l2x0.o
 obj-arm-y += arm_mptimer.o a15mpcore.o
 obj-arm-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o
diff --git a/configure b/configure
index 5466771..a995aff 100755
--- a/configure
+++ b/configure
@@ -4071,7 +4071,7 @@ esac
 if test "$target_softmmu" = "yes" ; then
   case "$TARGET_BASE_ARCH" in
   arm)
-    cflags="-DHAS_AUDIO $cflags"
+    cflags="-DHAS_AUDIO -DHAS_AUDIO_CHOICE $cflags"
   ;;
   lm32)
     cflags="-DHAS_AUDIO $cflags"
diff --git a/tizen/src/hw/maru_arm_board.c b/tizen/src/hw/maru_arm_board.c
index 0d53754..7a9e8f5 100644
--- a/tizen/src/hw/maru_arm_board.c
+++ b/tizen/src/hw/maru_arm_board.c
@@ -31,6 +31,7 @@
 #include "i2c.h"
 #include "exec-memory.h"
 #include "../tizen/src/hw/maru_brightness.h"
+#include "arch_init.h"
 
 #undef DEBUG
 //#define DEBUG
@@ -98,14 +99,6 @@ static void maru_arm_machine_init(ram_addr_t ram_size,
             initrd_filename);
     s = maru_arm_soc_init(get_system_memory(), ram_size);
 
-    /* WM8994 */
-    i2c_dev = i2c_create_slave(s->i2c_if[1], "wm8994", EXYNOS4210_WM8994_ADDR);
-
-    /* Audio */
-    dev = qdev_create(s->i2s_bus[0], "exynos4210.audio");
-    qdev_prop_set_ptr(dev, "wm8994", i2c_dev);
-    qdev_init_nofail(dev);
-
     /* PCI config */
     dev = qdev_create(NULL, "tizen_vpci");
     s->vpci_bus = sysbus_from_qdev(dev);
@@ -122,6 +115,8 @@ static void maru_arm_machine_init(ram_addr_t ram_size,
     codec_init(pci_bus);
     pci_maru_brightness_init(pci_bus);
 
+    audio_init(NULL, pci_bus);
+
     arm_load_kernel(first_cpu, &maru_arm_board_binfo);
 }