summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/zynq-7000.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-26 23:52:23 +0200
committerOlof Johansson <olof@lixom.net>2014-05-26 23:52:23 +0200
commit4fd09120443a47ea1876ecce494205420b94d201 (patch)
treee8194ee966c0ea64937b8ea3f6ac18652b8e0555 /arch/arm/boot/dts/zynq-7000.dtsi
parentMerge tag 'berlin-soc-3.16' of https://github.com/shesselba/linux-berlin into... (diff)
parentARM: zynq: Enable big-endian (diff)
downloadlinux-4fd09120443a47ea1876ecce494205420b94d201.tar.xz
linux-4fd09120443a47ea1876ecce494205420b94d201.zip
Merge tag 'zynq-cleanup-for-3.16' of git://git.xilinx.com/linux-xlnx into next/soc
Merge "Xilinx Zynq changes for v3.16" from Michal Simek: arm: Xilinx Zynq cleanup patches for v3.16 - Add support for BIG Endian - Add SOC_BUS support - Sort Kconfig options - Fix early console * tag 'zynq-cleanup-for-3.16' of git://git.xilinx.com/linux-xlnx: ARM: zynq: Enable big-endian ARM: zynq: Fix uart0 early console virtual address clocksource: cadence_ttc: Use readl/writel_relaxed instead of __raw ARM: zynq: Sort Kconfig options ARM: zynq: Add support for SOC_BUS Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/zynq-7000.dtsi')
-rw-r--r--arch/arm/boot/dts/zynq-7000.dtsi5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index c1176abc34d9..80d8e4f3f626 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -177,6 +177,11 @@
};
};
+ devcfg: devcfg@f8007000 {
+ compatible = "xlnx,zynq-devcfg-1.0";
+ reg = <0xf8007000 0x100>;
+ } ;
+
global_timer: timer@f8f00200 {
compatible = "arm,cortex-a9-global-timer";
reg = <0xf8f00200 0x20>;