Commit e66ce07a authored by Rob Herring's avatar Rob Herring Committed by Alexandre Belloni

ARM: config: Switch PXA27x platforms to use PXA RTC driver

With the SA1100 and PXA RTC drivers be mutually exclusive and no
longer sharing hardware, PXA27x/PXA3xx platforms must use the PXA RTC
driver as the SA1100 platform device is no longer registered.

This change should be almost transparent to userspace. Former users of
pxa-rtc should be aware that 2 RTCs will be available on their kernels,
rtc0 being sa1100-rtc and rtc1 being pxa-rtc. Any userspace relying on
the fact that rtc0 was pxa-rtc should be fixed.

As a consequence:
 - the first reboot after the switch will have the wrong time,
 - on dual boot platform where the other OS programs some logic into the
   sa1100 rtc IP, a lack of fix in userspace, ie. a kernel changing
   sa1100-rtc thinking it is pxa-rtc could have dire consequence, such
   as wiping the other OS data partition.

(Thanks to Robert Jarmik for help on the above commit text.)
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Cc: Daniel Mack <daniel@zonque.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Sergey Lapin <slapin@ossfans.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Rapoport <mike@compulab.co.il>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 7b758ef4
...@@ -157,7 +157,7 @@ CONFIG_LEDS_TRIGGERS=y ...@@ -157,7 +157,7 @@ CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_V3020=y CONFIG_RTC_DRV_V3020=y
CONFIG_RTC_DRV_SA1100=y CONFIG_RTC_DRV_PXA=y
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y CONFIG_EXT3_FS=y
CONFIG_INOTIFY=y CONFIG_INOTIFY=y
......
...@@ -157,7 +157,7 @@ CONFIG_LEDS_TRIGGERS=y ...@@ -157,7 +157,7 @@ CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_V3020=y CONFIG_RTC_DRV_V3020=y
CONFIG_RTC_DRV_SA1100=y CONFIG_RTC_DRV_PXA=y
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y CONFIG_EXT3_FS=y
CONFIG_INOTIFY=y CONFIG_INOTIFY=y
......
...@@ -150,7 +150,7 @@ CONFIG_LEDS_TRIGGERS=y ...@@ -150,7 +150,7 @@ CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_BACKLIGHT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
CONFIG_RTC_DEBUG=y CONFIG_RTC_DEBUG=y
CONFIG_RTC_DRV_SA1100=y CONFIG_RTC_DRV_PXA=y
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
CONFIG_INOTIFY=y CONFIG_INOTIFY=y
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
......
...@@ -67,7 +67,7 @@ CONFIG_MMC=y ...@@ -67,7 +67,7 @@ CONFIG_MMC=y
CONFIG_MMC_DEBUG=y CONFIG_MMC_DEBUG=y
CONFIG_MMC_PXA=y CONFIG_MMC_PXA=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_SA1100=y CONFIG_RTC_DRV_PXA=y
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y CONFIG_EXT3_FS=y
# CONFIG_DNOTIFY is not set # CONFIG_DNOTIFY is not set
......
...@@ -82,7 +82,7 @@ CONFIG_MMC=y ...@@ -82,7 +82,7 @@ CONFIG_MMC=y
CONFIG_MMC_PXA=y CONFIG_MMC_PXA=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_SA1100=m CONFIG_RTC_DRV_PXA=m
CONFIG_EXT2_FS=m CONFIG_EXT2_FS=m
CONFIG_EXT3_FS=m CONFIG_EXT3_FS=m
# CONFIG_DNOTIFY is not set # CONFIG_DNOTIFY is not set
......
...@@ -177,7 +177,7 @@ CONFIG_NEW_LEDS=y ...@@ -177,7 +177,7 @@ CONFIG_NEW_LEDS=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_HCTOSYS is not set # CONFIG_RTC_HCTOSYS is not set
CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_PCF8583=m
CONFIG_RTC_DRV_SA1100=y CONFIG_RTC_DRV_PXA=y
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_POSIX_ACL=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment