Upstream patch fixing the errors in the device tree. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>