diff options
| author | Eric Miao <eric.miao@linaro.org> | 2012-01-11 21:38:33 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-11 21:38:33 +0800 |
| commit | 3ffa6554d683f636518844887d5dc259b367e731 (patch) | |
| tree | f174b6b0f9892726c9b5ecdbd66d724a3e2ddc54 /include/linux/mxc_srtc.h | |
| parent | 143920b70301cd37462a2902f2965ef138ae90e6 (diff) | |
| parent | 20401bffc83f4e9fd18fd6032fea22082099ce88 (diff) | |
Merge branch 'lt-3.2-imx5' into topic/lt-3.2-imx6-uglytopic/lt-3.2-imx6-ugly
* lt-3.2-imx5: (124 commits)
SAUCE: fix the missing header of <linux/module.h>
SAUCE: fix the removal of mxc_register_device()
SAUCE: mx53_loco: fix gpio_to_irq() being non-constant
SAUCE: fix building errors after rebased to v3.2
LINARO: Add lt-mx5_defconfig
ARM i.MX5: fix system_rev if not set by atag or DT
ENGR00162701 mxc_vout: fix potential deadlock of fb_blank
ENGR00162666 mxc_vout: v4l2 playback blocking issue
ENGR00162665 ipuv3 fb: fix non-interleave format wrong color issue
ENGR00162664 mxc_vout: modify pp bypass condition
ENGR00162663 ipuv3 fb: add vertical flip support
ENGR00162475 ipuv3 fb: fix camera preview failure
ENGR00162360 mxc_vout: fix STREAMOFF and G_CROP issues
ENGR00162358 ipuv3 fb: only check pos when fb is unblank
ENGR00162354 ipuv3 device: correct kthread operation for split task
SAUCE: mx53: add mxc_lcdif support
SAUCE: add arm-pmu device
SAUCE: remove unnecessary suspend/resume functions from mxc_spdif
ENGR00162218 mxc_vout: put set position function before set var
ENGR00162208 ipuv3 device: fix jitter issue of split mode
...
Diffstat (limited to 'include/linux/mxc_srtc.h')
| -rw-r--r-- | include/linux/mxc_srtc.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/include/linux/mxc_srtc.h b/include/linux/mxc_srtc.h new file mode 100644 index 00000000000..1d3c7b6feef --- /dev/null +++ b/include/linux/mxc_srtc.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. All Rights Reserved. + */ + +/* + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/*! + * @file mxc_srtc.h + * + * @brief SRTC IOCTL definitions + * + * @ingroup RTC + */ + + +#define RTC_READ_TIME_47BIT _IOR('p', 0x20, unsigned long long) +/* blocks until LPSCMR is set, returns difference */ +#define RTC_WAIT_TIME_SET _IOR('p', 0x21, int64_t) |