diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2015-03-29 10:06:03 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-04-01 11:22:08 -0400 |
commit | e598e47144e41e8429bf127266bc3e8017d1a5f4 (patch) | |
tree | 91f7eaeafa6dac3bb4821e97704732eb735f910a | |
parent | fbacc8dfd8bab24d326b3055d38246ca7a2e1da5 (diff) |
MIPS: SEAD3: Use symbolic addresses from sead-addr.h in I2C driver.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/mti-sead3/sead3-i2c-drv.c | 9 |
1 files changed, 6 insertions, 3 deletions
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 @@ | |||
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. | 6 | * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. |
7 | * Copyright (C) 2015 Imagination Technologies, Inc. | ||
7 | */ | 8 | */ |
8 | #include <linux/init.h> | 9 | #include <linux/init.h> |
9 | #include <linux/module.h> | 10 | #include <linux/module.h> |
@@ -12,6 +13,8 @@ | |||
12 | #include <linux/i2c.h> | 13 | #include <linux/i2c.h> |
13 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
14 | 15 | ||
16 | #include <asm/mips-boards/sead3-addr.h> | ||
17 | |||
15 | #define PIC32_I2CxCON 0x0000 | 18 | #define PIC32_I2CxCON 0x0000 |
16 | #define PIC32_I2CCON_ON (1<<15) | 19 | #define PIC32_I2CCON_ON (1<<15) |
17 | #define PIC32_I2CCON_ACKDT (1<<5) | 20 | #define PIC32_I2CCON_ACKDT (1<<5) |
@@ -35,14 +38,14 @@ | |||
35 | 38 | ||
36 | static DEFINE_SPINLOCK(pic32_bus_lock); | 39 | static DEFINE_SPINLOCK(pic32_bus_lock); |
37 | 40 | ||
38 | static void __iomem *bus_xfer = (void __iomem *)0xbf000600; | 41 | static void __iomem *bus_xfer = (void __iomem *)SEAD3_PIC32_REGISTERS; |
39 | static void __iomem *bus_status = (void __iomem *)0xbf000060; | 42 | static void __iomem *bus_status = (void __iomem *)SEAD3_PI_PIC32_USB_STATUS; |
40 | 43 | ||
41 | #define DELAY() udelay(100) | 44 | #define DELAY() udelay(100) |
42 | 45 | ||
43 | static inline unsigned int ioready(void) | 46 | static inline unsigned int ioready(void) |
44 | { | 47 | { |
45 | return readl(bus_status) & 1; | 48 | return readl(bus_status) & SEAD3_PI_PIC32_USB_STATUS_IO_RDY; |
46 | } | 49 | } |
47 | 50 | ||
48 | static inline void wait_ioready(void) | 51 | static inline void wait_ioready(void) |