Explorar o código

sparc64: fix wrong m48t59 RTC year

Correctly calculate offset to the year register for
Mostek RTC.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Krzysztof Helt %!s(int64=16) %!d(string=hai) anos
pai
achega
3baca76f56
Modificáronse 1 ficheiros con 4 adicións e 2 borrados
  1. 4 2
      arch/sparc64/kernel/time.c

+ 4 - 2
arch/sparc64/kernel/time.c

@@ -500,6 +500,7 @@ static struct of_platform_driver bq4802_driver = {
 static unsigned char mostek_read_byte(struct device *dev, u32 ofs)
 static unsigned char mostek_read_byte(struct device *dev, u32 ofs)
 {
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	struct platform_device *pdev = to_platform_device(dev);
+	struct m48t59_plat_data *pdata = pdev->dev.platform_data;
 	void __iomem *regs;
 	void __iomem *regs;
 	unsigned char val;
 	unsigned char val;
 
 
@@ -507,7 +508,7 @@ static unsigned char mostek_read_byte(struct device *dev, u32 ofs)
 	val = readb(regs + ofs);
 	val = readb(regs + ofs);
 
 
 	/* the year 0 is 1968 */
 	/* the year 0 is 1968 */
-	if (ofs == M48T59_YEAR) {
+	if (ofs == pdata->offset + M48T59_YEAR) {
 		val += 0x68;
 		val += 0x68;
 		if ((val & 0xf) > 9)
 		if ((val & 0xf) > 9)
 			val += 6;
 			val += 6;
@@ -518,10 +519,11 @@ static unsigned char mostek_read_byte(struct device *dev, u32 ofs)
 static void mostek_write_byte(struct device *dev, u32 ofs, u8 val)
 static void mostek_write_byte(struct device *dev, u32 ofs, u8 val)
 {
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	struct platform_device *pdev = to_platform_device(dev);
+	struct m48t59_plat_data *pdata = pdev->dev.platform_data;
 	void __iomem *regs;
 	void __iomem *regs;
 
 
 	regs = (void __iomem *) pdev->resource[0].start;
 	regs = (void __iomem *) pdev->resource[0].start;
-	if (ofs == M48T59_YEAR) {
+	if (ofs == pdata->offset + M48T59_YEAR) {
 		if (val < 0x68)
 		if (val < 0x68)
 			val += 0x32;
 			val += 0x32;
 		else
 		else