diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-08-27 15:14:49 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-08-27 15:14:49 +0200 |
| commit | 8ce0436789b006622fcb6baea0c29b99385612dd (patch) | |
| tree | 9da56689f451c3644aa044d13e58caf978cd6f2e /arch/arm/mach-pxa/include/mach/mtd-xip.h | |
| parent | ed1094012ae82798de33bad0ba1cc5f19a005e68 (diff) | |
| parent | fabf08a0cd63ce39287646ceea10ac34781418f4 (diff) | |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.14
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/mtd-xip.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/mtd-xip.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/mtd-xip.h b/arch/arm/mach-pxa/include/mach/mtd-xip.h index 990d2bf2fb45..9bf4ea6a6f74 100644 --- a/arch/arm/mach-pxa/include/mach/mtd-xip.h +++ b/arch/arm/mach-pxa/include/mach/mtd-xip.h @@ -17,11 +17,15 @@ #include <mach/regs-ost.h> -#define xip_irqpending() (ICIP & ICMR) +/* restored July 2017, this did not build since 2011! */ + +#define ICIP io_p2v(0x40d00000) +#define ICMR io_p2v(0x40d00004) +#define xip_irqpending() (readl(ICIP) & readl(ICMR)) /* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */ -#define xip_currtime() (OSCR) -#define xip_elapsed_since(x) (signed)((OSCR - (x)) / 4) +#define xip_currtime() readl(OSCR) +#define xip_elapsed_since(x) (signed)((readl(OSCR) - (x)) / 4) /* * xip_cpu_idle() is used when waiting for a delay equal or larger than |