[coreboot-gerrit] Patch merged into coreboot/master: c05a905 nyan*: pinmux: fix PWM1/2 conflicts

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit c05a90595d77fc18436fef1e8f8fe3179a77d7b9
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
    Reviewed-on: http://review.coreboot.org/7759
    Tested-by: build bot (Jenkins)
    Reviewed-by: Stefan Reinauer <stefan.reinauer at coreboot.org>


See http://review.coreboot.org/7759 for details.

-gerrit