summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-05-26 06:01:31 (GMT)
committerLee Jones <lee.jones@linaro.org>2012-07-13 08:14:38 (GMT)
commitddb3b99c532930c9f891e97af5ef4e6691076c16 (patch)
treece35bd9bde8d54c9b68b0d3d8b07887be14c0955 /arch/arm/boot
parentd4b29ac1893e342f27fe79bd37641918e3364699 (diff)
downloadlinux-ddb3b99c532930c9f891e97af5ef4e6691076c16.tar.xz
ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled
During a Device Tree boot, all probing will now be completed on parse of the Device Tree binary. In the same patch we remove platform registration of the Real Time Clock. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/db8500.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi
index 1b7f795..f1dc98d 100644
--- a/arch/arm/boot/dts/db8500.dtsi
+++ b/arch/arm/boot/dts/db8500.dtsi
@@ -48,7 +48,7 @@
};
rtc@80154000 {
- compatible = "stericsson,db8500-rtc";
+ compatible = "arm,rtc-pl031", "arm,primecell";
reg = <0x80154000 0x1000>;
interrupts = <0 18 0x4>;
};