diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:01:43 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:01:43 +0100 |
| commit | 5af2ca472cccce7ba602ac83e6884f57d0995f28 (patch) | |
| tree | 6b2142f6bf0f46be67a65bc2f0ebb2200229b17d /arch/arm/boot/dts/vexpress-v2m.dtsi | |
| parent | 1d7123299d8639e60bea3def60577a1bfee584f7 (diff) | |
| parent | c0ac923b5e9addc55f56fc777e1137c6d0a59c3c (diff) | |
Merge branch 'tracking-armlt-clcd' into lsk-3.10-vexpress
Diffstat (limited to 'arch/arm/boot/dts/vexpress-v2m.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2m.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi index f1420368355..6593398c11a 100644 --- a/arch/arm/boot/dts/vexpress-v2m.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m.dtsi @@ -227,6 +227,7 @@ }; clcd@1f000 { + status = "disabled"; compatible = "arm,pl111", "arm,primecell"; reg = <0x1f000 0x1000>; interrupts = <14>; |