Per Heiko the original changes were correct and something is misbehaving on his hardware. This reverts commit 3d5931e598. Signed-off-by: Tom Rini <trini@konsulko.com>
3d5931e598