diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-26 12:50:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-26 12:50:04 -0700 |
commit | 39b6cc668c5ecc66f6f9c9293ffab681cb6f7065 (patch) | |
tree | f048b17a1b1a0a0f6d6a8d33459e8789c600c634 /include/linux/stmp_device.h | |
parent | 27953437059c64d14086196eb96f43c78caa9db3 (diff) | |
parent | 3f81b2c49d31e763a9c1da831ceb6cef087cf6c6 (diff) |
Merge tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc stmp-dev library code from Olof Johansson:
"A number of devices are using a common register layout, this adds
support code for it in lib/stmp_device.c so we do not need to
duplicate it in each driver."
Fix up trivial conflicts in drivers/i2c/busses/i2c-mxs.c and
lib/Makefile
* tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
i2c: mxs: use global reset function
lib: add support for stmp-style devices
Diffstat (limited to 'include/linux/stmp_device.h')
-rw-r--r-- | include/linux/stmp_device.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/include/linux/stmp_device.h b/include/linux/stmp_device.h new file mode 100644 index 00000000000..6cf7ec9547c --- /dev/null +++ b/include/linux/stmp_device.h @@ -0,0 +1,20 @@ +/* + * basic functions for devices following the "stmp" style register layout + * + * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef __STMP_DEVICE_H__ +#define __STMP_DEVICE_H__ + +#define STMP_OFFSET_REG_SET 0x4 +#define STMP_OFFSET_REG_CLR 0x8 +#define STMP_OFFSET_REG_TOG 0xc + +extern int stmp_reset_block(void __iomem *); +#endif /* __STMP_DEVICE_H__ */ |