diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2010-06-02 15:58:24 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-08-09 21:14:08 +0200 |
| commit | d643e2d2cc1d1f37751a99a7c4cb30064cc68aac (patch) | |
| tree | f1485b3c6b484112e3f32675c2c14b89a8f774ca /arch/m68k | |
| parent | 1b460102323a08874e942a330b896c30d50ab235 (diff) | |
| download | blackbird-op-linux-d643e2d2cc1d1f37751a99a7c4cb30064cc68aac.tar.gz blackbird-op-linux-d643e2d2cc1d1f37751a99a7c4cb30064cc68aac.zip | |
m68k/mac: Fix RTC on PMU machines
Copy RTC response bytes correctly on powerbooks and duos. Thanks to Diego
Cousinet who debugged this and provided me with the fix. Tested on
PowerBook 190 and Duo 280c.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reported-by: Diego Cousinet <diego@pvco.net>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/mac/misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index 0f118ca156d9..e023fc6b37e5 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c @@ -91,7 +91,7 @@ static void cuda_write_pram(int offset, __u8 data) #define cuda_write_pram NULL #endif -#if 0 /* def CONFIG_ADB_PMU68K */ +#ifdef CONFIG_ADB_PMU68K static long pmu_read_time(void) { struct adb_request req; @@ -102,8 +102,8 @@ static long pmu_read_time(void) while (!req.complete) pmu_poll(); - time = (req.reply[0] << 24) | (req.reply[1] << 16) - | (req.reply[2] << 8) | req.reply[3]; + time = (req.reply[1] << 24) | (req.reply[2] << 16) + | (req.reply[3] << 8) | req.reply[4]; return time - RTC_OFFSET; } |
