Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 19 Jan 2012 11:55:21 +0000 (11:55 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 19 Jan 2012 17:19:18 +0000 (17:19 +0000)
commita0164a574a3f284f438081c53fb864d275e54560
tree7242b315b8a7ca31bf70764669b463028bde79d7
parenta55b5adaf403c4d032e0871ad4ee3367782f4db6
Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"

This reverts commit 7cea00657dd4daef66ad95e976d5d67ed94cb97e.

The sa1100 cleanups fatally broke the SA1100 RTC driver - the first
hint that something is wrong are these compiler warnings:

drivers/rtc/rtc-sa1100.c:42:1: warning: "RCNR" redefined
In file included from arch/arm/mach-sa1100/include/mach/hardware.h:73,
                 from drivers/rtc/rtc-sa1100.c:35:
arch/arm/mach-sa1100/include/mach/SA-1100.h:877:1: warning: this is the location of the previous definition
drivers/rtc/rtc-sa1100.c:43:1: warning: "RTAR" redefined
arch/arm/mach-sa1100/include/mach/SA-1100.h:876:1: warning: this is the location of the previous definition
drivers/rtc/rtc-sa1100.c:44:1: warning: "RTSR" redefined
arch/arm/mach-sa1100/include/mach/SA-1100.h:879:1: warning: this is the location of the previous definition
drivers/rtc/rtc-sa1100.c:45:1: warning: "RTTR" redefined
arch/arm/mach-sa1100/include/mach/SA-1100.h:878:1: warning: this is the location of the previous definition
drivers/rtc/rtc-sa1100.c:47:1: warning: "RTSR_HZE" redefined
arch/arm/mach-sa1100/include/mach/SA-1100.h:891:1: warning: this is the location of the previous definition
drivers/rtc/rtc-sa1100.c:48:1: warning: "RTSR_ALE" redefined
arch/arm/mach-sa1100/include/mach/SA-1100.h:890:1: warning: this is the location of the previous definition
drivers/rtc/rtc-sa1100.c:49:1: warning: "RTSR_HZ" redefined
arch/arm/mach-sa1100/include/mach/SA-1100.h:889:1: warning: this is the location of the previous definition
drivers/rtc/rtc-sa1100.c:50:1: warning: "RTSR_AL" redefined
arch/arm/mach-sa1100/include/mach/SA-1100.h:888:1: warning: this is the location of the previous definition

and the second problem, which is far more severe, are the different
register layouts, resulting in the wrong registers being read on
SA11x0 platforms.  This patch adds:

#define RCNR           0x00    /* RTC Count Register */
#define RTAR           0x04    /* RTC Alarm Register */
#define RTSR           0x08    /* RTC Status Register */
#define RTTR           0x0c    /* RTC Timer Trim Register */

but the SA11x0 registers are:

#define RTAR            __REG(0x90010000)  /* RTC Alarm Reg. */
#define RCNR            __REG(0x90010004)  /* RTC CouNt Reg. */
#define RTTR            __REG(0x90010008)  /* RTC Trim Reg. */
#define RTSR            __REG(0x90010010)  /* RTC Status Reg. */
arch/arm/mach-pxa/devices.c
arch/arm/mach-sa1100/generic.c
drivers/rtc/Kconfig
drivers/rtc/rtc-sa1100.c