[coreboot-gerrit] Patch set updated for coreboot: b603c9c t132: Add I2S1 support to funit

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9576

-gerrit

commit b603c9c006ab093ab77cf702fa2e0a7132d35141
Author: Tom Warren <twarren at nvidia.com>
Date:   Fri Dec 5 13:28:08 2014 -0700

    t132: Add I2S1 support to funit
    
    Used for audio on Rush/Ryu. I2S1/DAP2 provides the audio
    'stream' for the dev/rec mode 'beeps'.
    
    BUG=chrome-os-partner:32582
    BRANCH=none
    TEST=With follow-on CLs that make use of this support,
    audio beeps (via VbExBeep) can be heard on Rush. Built
    both Rush and Ryu OK.
    
    Change-Id: Iea5559db4431e48001adbbce17fa0f3aaaf8387c
    Signed-off-by: Stefan Reinauer <reinauer at chromium.org>
    Original-Commit-Id: 2bd701a5f4186e49739b25f4afd5000d5d9b4970
    Original-Change-Id: Ia8c32303979f25300e22b5a14609d9d9d5ce3132
    Original-Signed-off-by: Tom Warren <twarren at nvidia.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/233670
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
---
 src/soc/nvidia/tegra132/funitcfg.c               | 1 +
 src/soc/nvidia/tegra132/include/soc/addressmap.h | 1 +
 src/soc/nvidia/tegra132/include/soc/clock.h      | 1 +
 src/soc/nvidia/tegra132/include/soc/funitcfg.h   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/soc/nvidia/tegra132/funitcfg.c b/src/soc/nvidia/tegra132/funitcfg.c
index 2aeafde..4c584c0 100644
--- a/src/soc/nvidia/tegra132/funitcfg.c
+++ b/src/soc/nvidia/tegra132/funitcfg.c
@@ -92,6 +92,7 @@ static const struct funit_cfg_data funit_data[] =  {
 	FUNIT_DATA_USB(USBD, L),
 	FUNIT_DATA_USB(USB2, H),
 	FUNIT_DATA_USB(USB3, H),
+	FUNIT_DATA(I2S1, i2s1, L),
 };
 _Static_assert(ARRAY_SIZE(funit_data) == FUNIT_INDEX_MAX,
 		"funit_cfg_data array not filled out!");
diff --git a/src/soc/nvidia/tegra132/include/soc/addressmap.h b/src/soc/nvidia/tegra132/include/soc/addressmap.h
index 36b0233..02ab2d4 100644
--- a/src/soc/nvidia/tegra132/include/soc/addressmap.h
+++ b/src/soc/nvidia/tegra132/include/soc/addressmap.h
@@ -89,6 +89,7 @@ enum {
 	TEGRA_SDMMC4_BASE =		TEGRA_SDMMC_BASE + 0x0600,
 	TEGRA_MIPI_CAL_BASE =		0x700E3000,
 	TEGRA_SYSCTR0_BASE =		0x700F0000,
+	TEGRA_I2S1_BASE =		0x70301100,
 	TEGRA_USBD_BASE =		0x7D000000,
 	TEGRA_USB2_BASE =		0x7D004000,
 	TEGRA_USB3_BASE =		0x7D008000,
diff --git a/src/soc/nvidia/tegra132/include/soc/clock.h b/src/soc/nvidia/tegra132/include/soc/clock.h
index 5fadbd0..8844827 100644
--- a/src/soc/nvidia/tegra132/include/soc/clock.h
+++ b/src/soc/nvidia/tegra132/include/soc/clock.h
@@ -221,6 +221,7 @@ enum {
 	CLK_SRC_DEVICE(I2C3, PLLP, PLLC2, PLLC, PLLC3, PLLM, UNUSED, CLK_M),
 	CLK_SRC_DEVICE(I2C5, PLLP, PLLC2, PLLC, PLLC3, PLLM, UNUSED, CLK_M),
 	CLK_SRC_DEVICE(I2C6, PLLP, PLLC2, PLLC, PLLC3, PLLM, UNUSED, CLK_M),
+	CLK_SRC_DEVICE(I2S1, PLLA, UNUSED, CLK_S, UNUSED1, PLLP, UNUSED2, CLK_M),
 	CLK_SRC_DEVICE(mselect, PLLP, PLLC2, PLLC, PLLC3, PLLM, CLK_S, CLK_M),
 	CLK_SRC_DEVICE(SBC1, PLLP, PLLC2, PLLC, PLLC3, PLLM, UNUSED, CLK_M),
 	CLK_SRC_DEVICE(SBC4, PLLP, PLLC2, PLLC, PLLC3, PLLM, UNUSED, CLK_M),
diff --git a/src/soc/nvidia/tegra132/include/soc/funitcfg.h b/src/soc/nvidia/tegra132/include/soc/funitcfg.h
index df27610..580bd75 100644
--- a/src/soc/nvidia/tegra132/include/soc/funitcfg.h
+++ b/src/soc/nvidia/tegra132/include/soc/funitcfg.h
@@ -40,6 +40,7 @@ enum {
 	FUNIT_INDEX(USBD),
 	FUNIT_INDEX(USB2),
 	FUNIT_INDEX(USB3),
+	FUNIT_INDEX(I2S1),
 	FUNIT_INDEX_MAX,
 };