[coreboot-gerrit] New patch to review for coreboot: f14796a Big, Blaze: Set I2S1 Source to CLK_M to Fix Beep

[Marc Jones (marc.jones@se-eng.com)]

Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7462

-gerrit

commit f14796aa509ce72f8921f8273a5d612ca0f03fe6
Author: Daisuke Nojiri <dnojiri at chromium.org>
Date:   Fri Mar 28 09:21:37 2014 -0700

    Big, Blaze: Set I2S1 Source to CLK_M to Fix Beep
    
    This is a companion patch of CL:191692 "Tegra: Fix Beep".
    
    TEST=Booted Big. Verified beeps at dev screen. Measured frequency by smartphone.
    Built Blaze.
    BUG=chrome-os-partner:26609
    BRANCH=none
    Signed-off-by: Daisuke Nojiri <dnojiri at chromium.org>
    
    Original-Change-Id: I9ba47d06202e9968a908c4a15cfbeac4bfe2c20c
    Original-Reviewed-on: https://chromium-review.googlesource.com/192063
    Original-Reviewed-by: Daisuke Nojiri <dnojiri at chromium.org>
    Original-Commit-Queue: Daisuke Nojiri <dnojiri at chromium.org>
    Original-Tested-by: Daisuke Nojiri <dnojiri at chromium.org>
    (cherry picked from commit 87a0f166e493b98d2a4e597f90ede090161fffdb)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: Id3b819745b0753862e8cfa43e7fa1ed4b27eb462
---
 src/mainboard/google/nyan_big/mainboard.c   | 7 ++++---
 src/mainboard/google/nyan_blaze/mainboard.c | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c
index 997ceb0..75ff0e7 100644
--- a/src/mainboard/google/nyan_big/mainboard.c
+++ b/src/mainboard/google/nyan_big/mainboard.c
@@ -53,10 +53,11 @@ static void set_clock_sources(void)
 	clock_configure_irregular_source(extperiph1, CLK_M, 12000, 3);
 
 	/*
-	 * I2S1 can use either PLLP or PLLA. Using PLLP is sufficient now since
-	 * we only need 4.8MHz. Note the source id of PLLP for I2S is 4.
+	 * We need 1.5MHz. So, we use CLK_M. CLK_DIVIDER macro returns a divisor
+	 * (0xe) a little bit off from the ideal value (0xd) but it's good
+	 * enough for beeps. The source id of CLK_M for I2S is 6.
 	 */
-	clock_configure_irregular_source(i2s1, PLLP, 4800, 4);
+	clock_configure_irregular_source(i2s1, CLK_M, 1500, 6);
 
 	/* Note source id of PLLP for HOST1x is 4. */
 	clock_configure_irregular_source(host1x, PLLP, 408000, 4);
diff --git a/src/mainboard/google/nyan_blaze/mainboard.c b/src/mainboard/google/nyan_blaze/mainboard.c
index dc105c6..2f385bc 100644
--- a/src/mainboard/google/nyan_blaze/mainboard.c
+++ b/src/mainboard/google/nyan_blaze/mainboard.c
@@ -53,10 +53,11 @@ static void set_clock_sources(void)
 	clock_configure_irregular_source(extperiph1, CLK_M, 12000, 3);
 
 	/*
-	 * I2S1 can use either PLLP or PLLA. Using PLLP is sufficient now since
-	 * we only need 4.8MHz. Note the source id of PLLP for I2S is 4.
+	 * We need 1.5MHz. So, we use CLK_M. CLK_DIVIDER macro returns a divisor
+	 * (0xe) a little bit off from the ideal value (0xd) but it's good
+	 * enough for beeps. The source id of CLK_M for I2S is 6.
 	 */
-	clock_configure_irregular_source(i2s1, PLLP, 4800, 4);
+	clock_configure_irregular_source(i2s1, CLK_M, 1500, 6);
 
 	/* Note source id of PLLP for HOST1x is 4. */
 	clock_configure_irregular_source(host1x, PLLP, 408000, 4);