Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0986b16a authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

m68k/mac: Use correct PMU response format 



Now that the 68k Mac port has adopted the via-pmu driver, it must decode
the PMU response accordingly otherwise the date and time will be wrong.

Fixes: ebd72227 ("macintosh/via-pmu: Replace via-pmu68k driver with via-pmu driver")
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 5b394b2d

arch/m68k/mac/misc.c

+4 −6
Original line number Diff line number Diff line
@@ -98,11 +98,10 @@ static time64_t pmu_read_time(void) 


	if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0)

		return 0;

	while (!req.complete)

		pmu_poll();

	pmu_wait_complete(&req);



	time = (u32)((req.reply[1] << 24) | (req.reply[2] << 16) |

		     (req.reply[3] << 8) | req.reply[4]);

	time = (u32)((req.reply[0] << 24) | (req.reply[1] << 16) |

		     (req.reply[2] << 8) | req.reply[3]);



	return time - RTC_OFFSET;

}
@@ -116,8 +115,7 @@ static void pmu_write_time(time64_t time) 
			(data >> 24) & 0xFF, (data >> 16) & 0xFF,

			(data >> 8) & 0xFF, data & 0xFF) < 0)

		return;

	while (!req.complete)

		pmu_poll();

	pmu_wait_complete(&req);

}



static __u8 pmu_read_pram(int offset)