[coreboot-gerrit] New patch to review for coreboot: e3eadd3 nyan*: pinmux: fix PWM1/2 conflicts

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

-gerrit

commit e3eadd3a97618e6e42b08490fa4f6dae2938b3a6
Author: Tom Warren <twarren at nvidia.com>
Date:   Mon Apr 14 10:01:21 2014 -0700

    nyan*: pinmux: fix PWM1/2 conflicts
    
    GPIO_PU4/PH1 and _PU5/PH2 were set to use the same PWM1/2 SFIO.
    Even though no problems were caused by this, correct it here
    so we get a conflict-free pinmux map.
    
    BUG=chrome-os-partner:27091
    BRANCH=none
    TEST=Built and booted on Nyan, ran TegraShell "pinmux check"
    and saw no conflicts.
    
    Original-Change-Id: Ib16341aa0c92b9a078d7f3254d4151e9592f40b0
    Original-Signed-off-by: Tom Warren <twarren at nvidia.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/194582
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
    (cherry picked from commit e06a5a62d381f803dd6574787795a51ce1f1fe74)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: I055359dc80c0c878ba5f5faac17884a5506a826c
---
 src/mainboard/google/nyan/romstage.c       | 6 +++++-
 src/mainboard/google/nyan_big/romstage.c   | 4 ++++
 src/mainboard/google/nyan_blaze/romstage.c | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c
index cc1bfae..62cbd50 100644
--- a/src/mainboard/google/nyan/romstage.c
+++ b/src/mainboard/google/nyan/romstage.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright 2013 Google Inc.
+ * Copyright 2014 Google Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -94,6 +94,10 @@ static void setup_pinmux(void)
 	// EC in RW.
 	gpio_input_pullup(GPIO(U4));
 
+	// route PU4/5 to GMI to remove conflict w/PWM1/2.
+	pinmux_set_config(PINMUX_GPIO_PU4_INDEX, PINMUX_GPIO_PU4_FUNC_NOR);        //s/b GMI
+	pinmux_set_config(PINMUX_GPIO_PU5_INDEX, PINMUX_GPIO_PU5_FUNC_NOR);        //s/b GMI
+
 	// SOC and TPM reset GPIO, active low.
 	gpio_output(GPIO(I5), 1);
 
diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c
index 48d3842..62cbd50 100644
--- a/src/mainboard/google/nyan_big/romstage.c
+++ b/src/mainboard/google/nyan_big/romstage.c
@@ -94,6 +94,10 @@ static void setup_pinmux(void)
 	// EC in RW.
 	gpio_input_pullup(GPIO(U4));
 
+	// route PU4/5 to GMI to remove conflict w/PWM1/2.
+	pinmux_set_config(PINMUX_GPIO_PU4_INDEX, PINMUX_GPIO_PU4_FUNC_NOR);        //s/b GMI
+	pinmux_set_config(PINMUX_GPIO_PU5_INDEX, PINMUX_GPIO_PU5_FUNC_NOR);        //s/b GMI
+
 	// SOC and TPM reset GPIO, active low.
 	gpio_output(GPIO(I5), 1);
 
diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index 48d3842..62cbd50 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/romstage.c
@@ -94,6 +94,10 @@ static void setup_pinmux(void)
 	// EC in RW.
 	gpio_input_pullup(GPIO(U4));
 
+	// route PU4/5 to GMI to remove conflict w/PWM1/2.
+	pinmux_set_config(PINMUX_GPIO_PU4_INDEX, PINMUX_GPIO_PU4_FUNC_NOR);        //s/b GMI
+	pinmux_set_config(PINMUX_GPIO_PU5_INDEX, PINMUX_GPIO_PU5_FUNC_NOR);        //s/b GMI
+
 	// SOC and TPM reset GPIO, active low.
 	gpio_output(GPIO(I5), 1);