diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-04-18 10:13:21 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-29 09:47:29 -0700 |
commit | dfc855921b899a61b9cef8e48d74441a2876e75f (patch) | |
tree | db68f526869e937c6a25b8ab382da8960770585e /arch | |
parent | 16a06df257641d466895454f0320b8ccb1583b21 (diff) | |
download | linux-3.10-dfc855921b899a61b9cef8e48d74441a2876e75f.tar.gz linux-3.10-dfc855921b899a61b9cef8e48d74441a2876e75f.tar.bz2 linux-3.10-dfc855921b899a61b9cef8e48d74441a2876e75f.zip |
ARM: at91: at91sam9x5 RTC is not compatible with at91rm9200 one
commit 23fb05c688a8dcb0cf6a4d8d819cffeca82e5c54 upstream.
Due to a bug with RTC IMR, we cannot consider at91sam9x5 RTC compatible
with the previous one. Modify DT compatibility string, even if the driver
is not yet modified to take it into account.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 1145ac330fb..b5833d1f7cf 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi @@ -643,7 +643,7 @@ }; rtc@fffffeb0 { - compatible = "atmel,at91rm9200-rtc"; + compatible = "atmel,at91sam9x5-rtc"; reg = <0xfffffeb0 0x40>; interrupts = <1 4 7>; status = "disabled"; |