From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 29 Mar 2015 14:06:03 +0000 (+0200)
Subject: MIPS: SEAD3: Use symbolic addresses from sead-addr.h in I2C driver.
X-Git-Tag: firefly_0821_release~176^2~1944^2~96
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e598e47144e41e8429bf127266bc3e8017d1a5f4;p=firefly-linux-kernel-4.4.55.git

MIPS: SEAD3: Use symbolic addresses from sead-addr.h in I2C driver.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/mti-sead3/sead3-i2c-drv.c b/arch/mips/mti-sead3/sead3-i2c-drv.c
index 6aaf6f88308b..a43b0503097c 100644
--- a/arch/mips/mti-sead3/sead3-i2c-drv.c
+++ b/arch/mips/mti-sead3/sead3-i2c-drv.c
@@ -4,6 +4,7 @@
  * for more details.
  *
  * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
+ * Copyright (C) 2015 Imagination Technologies, Inc.
  */
 #include <linux/init.h>
 #include <linux/module.h>
@@ -12,6 +13,8 @@
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 
+#include <asm/mips-boards/sead3-addr.h>
+
 #define PIC32_I2CxCON		0x0000
 #define	 PIC32_I2CCON_ON	(1<<15)
 #define	 PIC32_I2CCON_ACKDT	(1<<5)
@@ -35,14 +38,14 @@
 
 static DEFINE_SPINLOCK(pic32_bus_lock);
 
-static void __iomem *bus_xfer	= (void __iomem *)0xbf000600;
-static void __iomem *bus_status = (void __iomem *)0xbf000060;
+static void __iomem *bus_xfer	= (void __iomem *)SEAD3_PIC32_REGISTERS;
+static void __iomem *bus_status = (void __iomem *)SEAD3_PI_PIC32_USB_STATUS;
 
 #define DELAY() udelay(100)
 
 static inline unsigned int ioready(void)
 {
-	return readl(bus_status) & 1;
+	return readl(bus_status) & SEAD3_PI_PIC32_USB_STATUS_IO_RDY;
 }
 
 static inline void wait_ioready(void)