diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-18 16:46:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-18 16:46:29 +0100 |
| commit | 9bca3d7f7c5865700303e8bce0eac57bab76bcc7 (patch) | |
| tree | 2e31b6d77ab5d206e5cada5590100150774cf3f9 /arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | |
| parent | 38b52683569174d95efcb60edfb4985be0e023b5 (diff) | |
| parent | dc2ed0827570f07ab496e9742d48eaaac07e4ff8 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
Conflicts (look like simple add/add stuff):
arch/arm/Kconfig
arch/arm/common/Makefile
Diffstat (limited to 'arch/arm/boot/dts/vexpress-v2m-rs1.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi index ac870fb3fa0d..9584232ee6b6 100644 --- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi @@ -228,6 +228,7 @@ }; clcd@1f0000 { + status = "disabled"; compatible = "arm,pl111", "arm,primecell"; reg = <0x1f0000 0x1000>; interrupts = <14>; |