summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2015-09-19 15:00:19 +0530
committerTom Rini <trini@konsulko.com>2015-10-22 14:19:51 -0400
commit8a9bb065da466fe7e26dae7b2f234bb2135c7b9e (patch)
tree3602190f5ca7657e71819dd7a028e8829d92783e /arch/arm
parent351f9690881c484ff9061e7792792c890c5bc10c (diff)
downloadtalos-obmc-uboot-8a9bb065da466fe7e26dae7b2f234bb2135c7b9e.tar.gz
talos-obmc-uboot-8a9bb065da466fe7e26dae7b2f234bb2135c7b9e.zip
ARM: dts: keystone2: Do not use LPAE addresses in U-Boot
Keystone dts files assumes that LPAE is enabled and top level root node uses 64bit addresses. This breaks the keystone boot with CONFIG_OF_CONTROL enabled. So do not use 64 bit addresse in U-Boot DT. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/dts/keystone.dtsi17
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/dts/keystone.dtsi b/arch/arm/dts/keystone.dtsi
index 72816d65f7..9ab260fb87 100644
--- a/arch/arm/dts/keystone.dtsi
+++ b/arch/arm/dts/keystone.dtsi
@@ -13,8 +13,8 @@
/ {
model = "Texas Instruments Keystone 2 SoC";
- #address-cells = <2>;
- #size-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <1>;
interrupt-parent = <&gic>;
aliases {
@@ -22,17 +22,17 @@
};
memory {
- reg = <0x00000000 0x80000000 0x00000000 0x40000000>;
+ reg = <0x80000000 0x40000000>;
};
gic: interrupt-controller {
compatible = "arm,cortex-a15-gic";
#interrupt-cells = <3>;
interrupt-controller;
- reg = <0x0 0x02561000 0x0 0x1000>,
- <0x0 0x02562000 0x0 0x2000>,
- <0x0 0x02564000 0x0 0x1000>,
- <0x0 0x02566000 0x0 0x2000>;
+ reg = <0x02561000 0x1000>,
+ <0x02562000 0x2000>,
+ <0x02564000 0x1000>,
+ <0x02566000 0x2000>;
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |
IRQ_TYPE_LEVEL_HIGH)>;
};
@@ -63,8 +63,7 @@
#size-cells = <1>;
compatible = "ti,keystone","simple-bus";
interrupt-parent = <&gic>;
- ranges = <0x0 0x0 0x0 0xc0000000>;
- dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
+ ranges;
pllctrl: pll-controller@02310000 {
compatible = "ti,keystone-pllctrl", "syscon";
OpenPOWER on IntegriCloud