diff options
| author |   Pawel Moll <pawel.moll@arm.com> | 2012-10-16 15:27:12 +0100 |
|---|---|---|
| committer | Pawel Moll <pawel.moll@arm.com> | 2012-11-05 17:09:52 +0000 |
| commit | 433683a66401adb0150792e725cc4f631c94de46 (patch) | |
| tree | a820c2b4faddc6109e449a21b551b4a18339c287 /arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | |
| parent | ARM: vexpress: Start using new Versatile Express infrastructure (diff) | |
| download | linux-dev-433683a66401adb0150792e725cc4f631c94de46.tar.xz linux-dev-433683a66401adb0150792e725cc4f631c94de46.zip | |
ARM: vexpress: Remove motherboard dependencies in the DTS files
The way the VE motherboard Device Trees were constructed
enforced naming and structure of daughterboard files. This
patch makes it possible to simply include the motherboard
description anywhere in the main Device Tree and retires
the "arm,v2m-timer" alias - any of the motherboard SP804
timers will be used instead.
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Diffstat (limited to 'arch/arm/boot/dts/vexpress-v2m-rs1.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi index 9a7b6922f83b..ac870fb3fa0d 100644 --- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi @@ -17,18 +17,16 @@ * CHANGES TO vexpress-v2m.dtsi! */ -/ { - aliases { - arm,v2m_timer = &v2m_timer01; - }; - motherboard { - compatible = "simple-bus"; + model = "V2M-P1"; + arm,hbi = <0x190>; arm,vexpress,site = <0>; arm,v2m-memory-map = "rs1"; + compatible = "arm,vexpress,v2m-p1", "simple-bus"; #address-cells = <2>; /* SMB chipselect number and offset */ #size-cells = <1>; #interrupt-cells = <1>; + ranges; flash@0,00000000 { compatible = "arm,vexpress-flash", "cfi-flash"; @@ -340,4 +338,3 @@ }; }; }; -}; |