Merge remote-tracking branch 'rtc/rtc-next'

diff --combined Documentation/devicetree/bindings/i2c/trivial-devices.txt
index 310b1bbef5fcd28c48408af7c26a5ff08fa6064e,43af4765d5fed19f02b4dbec01621100f10b283d..badf5eb6696ea63c130bca5f40de9288cf37d4db
--- 1/Documentation/devicetree/bindings/i2c/trivial-devices.txt
--- 2/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@@ -38,7 -38,6 +38,7 @@@ dallas,ds4510         CPU Supervisor with Nonv
  dallas,ds75           Digital Thermometer and Thermostat
  dlg,da9053            DA9053: flexible system level PMIC with multicore support
  dlg,da9063            DA9063: system PMIC for quad-core application processors
 +domintech,dmard09     DMARD09: 3-axis Accelerometer
  epson,rx8010          I2C-BUS INTERFACE REAL TIME CLOCK MODULE
  epson,rx8025          High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE
  epson,rx8581          I2C-BUS INTERFACE REAL TIME CLOCK MODULE
@@@ -51,7 -50,6 +51,6 @@@ fsl,sgtl5000          SGTL5000: Ultra Low-Powe
  gmt,g751              G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface
  infineon,slb9635tt    Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz)
  infineon,slb9645tt    Infineon SLB9645 I2C TPM (new protocol, max 400khz)
- isil,isl12057         Intersil ISL12057 I2C RTC Chip
  isil,isl29028         Intersil ISL29028 Ambient Light and Proximity Sensor
  maxim,ds1050          5 Bit Programmable, Pulse-Width Modulator
  maxim,max1237         Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs

diff --combined drivers/rtc/Kconfig
index d1e080701264f230235668b07aedf0e4936ba4f9,896302a0d4b9d2313139ec45f1445d99b9421e80..6881b5d28cdc6ed2746a2e9cdd83aea3a4cd1f3d
--- 1/drivers/rtc/Kconfig
--- 2/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@ -208,14 -208,14 +208,14 @@@ config RTC_DRV_AS372
          will be called rtc-as3722.
  
  config RTC_DRV_DS1307
-       tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00, EPSON RX-8025"
+       tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00, EPSON RX-8025, ISL12057"
        help
          If you say yes here you get support for various compatible RTC
          chips (often with battery backup) connected with I2C. This driver
          should handle DS1307, DS1337, DS1338, DS1339, DS1340, ST M41T00,
-         EPSON RX-8025 and probably other chips. In some cases the RTC
-         must already have been initialized (by manufacturing or a
-         bootloader).
+         EPSON RX-8025, Intersil ISL12057 and probably other chips. In some
+         cases the RTC must already have been initialized (by manufacturing or
+         a bootloader).
  
          The first seven registers on these chips hold an RTC, and other
          registers may add features such as NVRAM, a trickle charger for
@@@ -234,6 -234,20 +234,20 @@@ config RTC_DRV_DS1307_HWMO
          Say Y here if you want to expose temperature sensor data on
          rtc-ds1307 (only DS3231)
  
+ config RTC_DRV_DS1307_CENTURY
+       bool "Century bit support for rtc-ds1307"
+       depends on RTC_DRV_DS1307
+       default n
+       help
+         The DS1307 driver suffered from a bug where it was enabling the
+         century bit inconditionnally but never used it when reading the time.
+         It made the driver unable to support dates beyond 2099.
+         Setting this option will add proper support for the century bit but if
+         the time was previously set using a kernel predating this option,
+         reading the date will return a date in the next century.
+         To solve that, you could boot a kernel without this option set, set
+         the RTC date and then boot a kernel with this option set.
+ 
  config RTC_DRV_DS1374
        tristate "Dallas/Maxim DS1374"
        help
@@@ -338,11 -352,11 +352,11 @@@ config RTC_DRV_MAX7768
          will be called rtc-max77686.
  
  config RTC_DRV_RK808
 -      tristate "Rockchip RK808 RTC"
 +      tristate "Rockchip RK808/RK818 RTC"
        depends on MFD_RK808
        help
          If you say yes here you will get support for the
 -        RTC of RK808 PMIC.
 +        RTC of RK808 and RK818 PMIC.
  
          This driver can also be built as a module. If so, the module
          will be called rk808-rtc.
@@@ -374,16 -388,6 +388,6 @@@ config RTC_DRV_ISL1202
          This driver can also be built as a module. If so, the module
          will be called rtc-isl12022.
  
- config RTC_DRV_ISL12057
-       select REGMAP_I2C
-       tristate "Intersil ISL12057"
-       help
-         If you say yes here you get support for the Intersil ISL12057
-         I2C RTC chip.
- 
-         This driver can also be built as a module. If so, the module
-         will be called rtc-isl12057.
- 
  config RTC_DRV_X1205
        tristate "Xicor/Intersil X1205"
        help
@@@ -1201,7 -1205,7 +1205,7 @@@ comment "on-CPU RTC drivers
  
  config RTC_DRV_ASM9260
        tristate "Alphascale asm9260 RTC"
-       depends on MACH_ASM9260
+       depends on MACH_ASM9260 || COMPILE_TEST
        help
          If you say yes here you get support for the RTC on the
          Alphascale asm9260 SoC.