commit c25c81b52a6759cf3be017f6d45803b76029bd6a
author Hung-Te Lin <hungte@chromium.org> Tue Nov 12 22:09:35 2013 +0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Nov 15 15:58:31 2013 +0000
tree e8285c6bbb3d1418bf98fb86b24a5966a07d677a
parent 4007a374de8847a3c2392182c02bd914776bf69d

nyan: Enable audio drivers.

Enable all the required audio components on Nyan to get the audio work.

BUG=none
TEST=emerge-nyan depthcharge chromeos-bootimage; # can hear the 'beep'.
BRANCH=none

Change-Id: I4777014b3d6fc2a0d2701c8ab74767cb0adfaba5
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/176521

board/nyan/defconfig

diff --git a/board/nyan/defconfig b/board/nyan/defconfig
index c862a79..92456e3 100644
--- a/board/nyan/defconfig
+++ b/board/nyan/defconfig
@@ -26,6 +26,7 @@
 
 # Drivers
 CONFIG_DRIVER_BUS_I2C_TEGRA=y
+CONFIG_DRIVER_BUS_I2S_TEGRA=y
 CONFIG_DRIVER_BUS_SPI_TEGRA=y
 CONFIG_DRIVER_DMA_TEGRA_APB=y
 CONFIG_DRIVER_EC_CROS=y
@@ -39,7 +40,9 @@
 CONFIG_DRIVER_POWER_AS3722=y
 CONFIG_DRIVER_SERIAL_TEGRA=y
 CONFIG_DRIVER_SOUND_I2S=y
+CONFIG_DRIVER_SOUND_MAX98090=y
 CONFIG_DRIVER_SOUND_ROUTE=y
+CONFIG_DRIVER_SOUND_TEGRA_AUDIO_HUB=y
 CONFIG_DRIVER_STORAGE_MMC=y
 CONFIG_DRIVER_STORAGE_MMC_TEGRA=y
 CONFIG_DRIVER_TIMER_TEGRA_1US=y

src/board/nyan/board.c

diff --git a/src/board/nyan/board.c b/src/board/nyan/board.c
index 7a476b7..699d499 100644
--- a/src/board/nyan/board.c
+++ b/src/board/nyan/board.c
@@ -25,6 +25,7 @@
 #include "base/init_funcs.h"
 #include "config.h"
 #include "drivers/bus/i2c/tegra.h"
+#include "drivers/bus/i2s/tegra.h"
 #include "drivers/bus/spi/tegra.h"
 #include "drivers/bus/usb/usb.h"
 #include "drivers/ec/cros/spi.h"
@@ -33,6 +34,9 @@
 #include "drivers/gpio/sysinfo.h"
 #include "drivers/gpio/tegra.h"
 #include "drivers/power/as3722.h"
+#include "drivers/sound/i2s.h"
+#include "drivers/sound/max98090.h"
+#include "drivers/sound/tegra_ahub.h"
 #include "drivers/storage/tegra_mmc.h"
 #include "drivers/tpm/slb9635_i2c.h"
 #include "drivers/tpm/tpm.h"
@@ -89,6 +93,37 @@
 	if (!spi1)
 		return 1;
 
+	TegraAudioHubXbar *xbar = new_tegra_audio_hub_xbar(0x70300800);
+	if (!xbar)
+		return 1;
+	TegraAudioHubApbif *apbif = new_tegra_audio_hub_apbif(0x70300000, 8);
+	if (!apbif)
+		return 1;
+
+	TegraI2s *i2s1 = new_tegra_i2s(0x70301100, &apbif->ops, 1, 16, 2,
+				       4800000, 48000);
+	if (!i2s1)
+		return 1;
+	TegraAudioHub *ahub = new_tegra_audio_hub(xbar, apbif, i2s1);
+	if (!ahub)
+		return 1;
+	I2sSource *i2s_source = new_i2s_source(&i2s1->ops, 48000, 2, 16000);
+	if (!i2s_source)
+		return 1;
+	SoundRoute *sound_route = new_sound_route(&i2s_source->ops);
+	if (!sound_route)
+		return 1;
+	TegraI2c *i2c1 = new_tegra_i2c((void *)0x7000c000, 1);
+	Max98090Codec *codec = new_max98090_codec(
+			&i2c1->ops, 0x10, 16, 48000, 256, 1);
+	if (!codec)
+		return 1;
+	list_insert_after(&ahub->component.list_node, &sound_route->components);
+	list_insert_after(&codec->component.list_node,
+			  &sound_route->components);
+	if (sound_set_ops(&sound_route->ops))
+		return 1;
+
 	CrosEcSpiBus *cros_ec_spi_bus = new_cros_ec_spi_bus(&spi1->ops);
 	if (!cros_ec_spi_bus || cros_ec_set_bus(&cros_ec_spi_bus->ops))
 		return 1;