diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-02-11 14:02:37 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-02-11 18:21:45 +0100 |
| commit | 8858d88a25142544843869f0cd3e6654aa7b4aec (patch) | |
| tree | 941181fa1b8b415d17f609851f01bd3eb1262aca | |
| parent | ARM: zynq: Reserve not DMAable space in front of the kernel (diff) | |
| download | linux-8858d88a25142544843869f0cd3e6654aa7b4aec.tar.xz linux-8858d88a25142544843869f0cd3e6654aa7b4aec.zip | |
ARM: ux500: disable msp2 device tree node
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>
| -rw-r--r-- | arch/arm/boot/dts/ste-href.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index 0c1e8d871ed1..6cb9b68e2188 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -188,7 +188,6 @@ msp2: msp@80117000 { pinctrl-names = "default"; pinctrl-0 = <&msp2_default_mode>; - status = "okay"; }; msp3: msp@80125000 { |