[coreboot-gerrit] New patch to review for coreboot: eda2e0d tegra124: fix OSC initialization on LP0 resume

[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/7412

-gerrit

commit eda2e0d75323aa437e15ee08d030140d903d225a
Author: Andrew Bresticker <abrestic at chromium.org>
Date:   Wed Mar 5 11:38:54 2014 -0800

    tegra124: fix OSC initialization on LP0 resume
    
    Add a missing "~" so that we mask off just OSC_XOFS field and not the
    rest of the register.
    
    BUG=chrome-os-partner:26326
    TEST=XHCI sometimes works after LP0.
    BRANCH=none
    
    Original-Change-Id: I2df2387dbad6920d36aa2ae5e6cd91e9ec42fa08
    Original-Signed-off-by: Andrew Bresticker <abrestic at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/188897
    Original-Reviewed-by: Julius Werner <jwerner at chromium.org>
    (cherry picked from commit bdbe9ead46fa883618a4acedd1feaf676e2eb29b)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: Ic853e737fc106527eb3bb15c25bf801a36bbff57
---
 src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c b/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c
index 72506c8..b993e31 100644
--- a/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c
+++ b/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c
@@ -326,7 +326,7 @@ static void config_oscillator(void)
 		    PMC_XOFS_MASK) >> PMC_XOFS_SHIFT;
 
 	uint32_t osc_ctrl = read32(clk_rst_osc_ctrl_ptr);
-	osc_ctrl &= OSC_XOFS_MASK;
+	osc_ctrl &= ~OSC_XOFS_MASK;
 	osc_ctrl |= (xofs << OSC_XOFS_SHIFT);
 	osc_ctrl |= OSC_XOE;
 	write32(osc_ctrl, clk_rst_osc_ctrl_ptr);