diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-05 09:48:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-05 09:48:22 -0400 |
| commit | 6c84239d595dc6ffe39f0f03dae2f64ed200db95 (patch) | |
| tree | 3aea4368a644be16e44612c964aa26152854e1ae /include/linux/platform_data | |
| parent | d4c06c708123c652025d04fe77b7e39448077395 (diff) | |
| parent | 6f367788d6333a41fefd013975b0b160d5c0a1c8 (diff) | |
Merge tag 'rtc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni:
"RTC for 4.8
Cleanups:
- huge cleanup of rtc-generic and char/genrtc this allowed to cleanup
rtc-cmos, rtc-sh, rtc-m68k, rtc-powerpc and rtc-parisc
- move mn10300 to rtc-cmos
Subsystem:
- fix wakealarms after hibernate
- multiples fixes for rctest
- simplify implementations of .read_alarm
New drivers:
- Maxim MAX6916
Drivers:
- ds1307: fix weekday
- m41t80: add wakeup support
- pcf85063: add support for PCF85063A variant
- rv8803: extend i2c fix and other fixes
- s35390a: fix alarm reading, this fixes instant reboot after
shutdown for QNAP TS-41x
- s3c: clock fixes"
* tag 'rtc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (65 commits)
rtc: rv8803: Clear V1F when setting the time
rtc: rv8803: Stop the clock while setting the time
rtc: rv8803: Always apply the I²C workaround
rtc: rv8803: Fix read day of week
rtc: rv8803: Remove the check for valid time
rtc: rv8803: Kconfig: Indicate rx8900 support
rtc: asm9260: remove .owner field for driver
rtc: at91sam9: Fix missing spin_lock_init()
rtc: m41t80: add suspend handlers for alarm IRQ
rtc: m41t80: make it a real error message
rtc: pcf85063: Add support for the PCF85063A device
rtc: pcf85063: fix year range
rtc: hym8563: in .read_alarm set .tm_sec to 0 to signal minute accuracy
rtc: explicitly set tm_sec = 0 for drivers with minute accurancy
rtc: s3c: Add s3c_rtc_{enable/disable}_clk in s3c_rtc_setfreq()
rtc: s3c: Remove unnecessary call to disable already disabled clock
rtc: abx80x: use devm_add_action_or_reset()
rtc: m41t80: use devm_add_action_or_reset()
rtc: fix a typo and reduce three empty lines to one
rtc: s35390a: improve two comments in .set_alarm
...
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/rtc-ds2404.h | 20 | ||||
| -rw-r--r-- | include/linux/platform_data/rtc-m48t86.h | 16 | ||||
| -rw-r--r-- | include/linux/platform_data/rtc-v3020.h | 41 |
3 files changed, 77 insertions, 0 deletions
diff --git a/include/linux/platform_data/rtc-ds2404.h b/include/linux/platform_data/rtc-ds2404.h new file mode 100644 index 000000000000..22c53825528f --- /dev/null +++ b/include/linux/platform_data/rtc-ds2404.h | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | /* | ||
| 2 | * ds2404.h - platform data structure for the DS2404 RTC. | ||
| 3 | * | ||
| 4 | * This file is subject to the terms and conditions of the GNU General Public | ||
| 5 | * License. See the file "COPYING" in the main directory of this archive | ||
| 6 | * for more details. | ||
| 7 | * | ||
| 8 | * Copyright (C) 2012 Sven Schnelle <svens@stackframe.org> | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __LINUX_DS2404_H | ||
| 12 | #define __LINUX_DS2404_H | ||
| 13 | |||
| 14 | struct ds2404_platform_data { | ||
| 15 | |||
| 16 | unsigned int gpio_rst; | ||
| 17 | unsigned int gpio_clk; | ||
| 18 | unsigned int gpio_dq; | ||
| 19 | }; | ||
| 20 | #endif | ||
diff --git a/include/linux/platform_data/rtc-m48t86.h b/include/linux/platform_data/rtc-m48t86.h new file mode 100644 index 000000000000..915d6b4f0f89 --- /dev/null +++ b/include/linux/platform_data/rtc-m48t86.h | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | /* | ||
| 2 | * ST M48T86 / Dallas DS12887 RTC driver | ||
| 3 | * Copyright (c) 2006 Tower Technologies | ||
| 4 | * | ||
| 5 | * Author: Alessandro Zummo <a.zummo@towertech.it> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | |||
| 12 | struct m48t86_ops | ||
| 13 | { | ||
| 14 | void (*writebyte)(unsigned char value, unsigned long addr); | ||
| 15 | unsigned char (*readbyte)(unsigned long addr); | ||
| 16 | }; | ||
diff --git a/include/linux/platform_data/rtc-v3020.h b/include/linux/platform_data/rtc-v3020.h new file mode 100644 index 000000000000..e55d82cebf80 --- /dev/null +++ b/include/linux/platform_data/rtc-v3020.h | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | /* | ||
| 2 | * v3020.h - Registers definition and platform data structure for the v3020 RTC. | ||
| 3 | * | ||
| 4 | * This file is subject to the terms and conditions of the GNU General Public | ||
| 5 | * License. See the file "COPYING" in the main directory of this archive | ||
| 6 | * for more details. | ||
| 7 | * | ||
| 8 | * Copyright (C) 2006, 8D Technologies inc. | ||
| 9 | */ | ||
| 10 | #ifndef __LINUX_V3020_H | ||
| 11 | #define __LINUX_V3020_H | ||
| 12 | |||
| 13 | /* The v3020 has only one data pin but which one | ||
| 14 | * is used depends on the board. */ | ||
| 15 | struct v3020_platform_data { | ||
| 16 | int leftshift; /* (1<<(leftshift)) & readl() */ | ||
| 17 | |||
| 18 | unsigned int use_gpio:1; | ||
| 19 | unsigned int gpio_cs; | ||
| 20 | unsigned int gpio_wr; | ||
| 21 | unsigned int gpio_rd; | ||
| 22 | unsigned int gpio_io; | ||
| 23 | }; | ||
| 24 | |||
| 25 | #define V3020_STATUS_0 0x00 | ||
| 26 | #define V3020_STATUS_1 0x01 | ||
| 27 | #define V3020_SECONDS 0x02 | ||
| 28 | #define V3020_MINUTES 0x03 | ||
| 29 | #define V3020_HOURS 0x04 | ||
| 30 | #define V3020_MONTH_DAY 0x05 | ||
| 31 | #define V3020_MONTH 0x06 | ||
| 32 | #define V3020_YEAR 0x07 | ||
| 33 | #define V3020_WEEK_DAY 0x08 | ||
| 34 | #define V3020_WEEK 0x09 | ||
| 35 | |||
| 36 | #define V3020_IS_COMMAND(val) ((val)>=0x0E) | ||
| 37 | |||
| 38 | #define V3020_CMD_RAM2CLOCK 0x0E | ||
| 39 | #define V3020_CMD_CLOCK2RAM 0x0F | ||
| 40 | |||
| 41 | #endif /* __LINUX_V3020_H */ | ||
