]> Pileus Git - ~andy/linux/commitdiff
ARM: ux500: disable msp2 device tree node
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 11 Feb 2014 13:02:37 +0000 (14:02 +0100)
committerKevin Hilman <khilman@linaro.org>
Tue, 11 Feb 2014 17:21:45 +0000 (09:21 -0800)
Commit 70b41abc151f9
"ARM: ux500: move MSP pin control to the device tree"
accidentally activated MSP2, giving rise to a boot scroll
scream as the kernel attempts to probe a driver for it and
fails to obtain DMA channel 14.

Fix this up by marking the node disabled again.

Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
arch/arm/boot/dts/ste-href.dtsi

index 0c1e8d871ed1a45662198501fb133aa29bf46af0..6cb9b68e2188a59fecb89e750023551a17c0334f 100644 (file)
                msp2: msp@80117000 {
                        pinctrl-names = "default";
                        pinctrl-0 = <&msp2_default_mode>;
-                       status = "okay";
                };
 
                msp3: msp@80125000 {