diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2013-11-08 15:37:55 +0530 |
|---|---|---|
| committer | Laxman Dewangan <ldewangan@nvidia.com> | 2013-11-09 02:58:53 -0800 |
| commit | d03b078ff879554c3a02f55e91c66d90562c2a7a (patch) | |
| tree | 93b1fe1e5f4a09efe9348d0f06c3c54ce0197882 /include/linux/mfd | |
| parent | 7e305905f2baf97ddaacf8e9b4497da648ca6bb8 (diff) | |
rtc: as3722: align driver with mainline
Align the RTC driver of ams AS3722 based on mainline:
/**
commit a1e01867211112691e80701a01ed9900655f7fe5
drivers/rtc/rtc-as3722: add RTC driver
Add a driver to support accessing the RTC found on the ams AS3722
PMIC using RTC framework.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Florian Lobmaier <florian.lobmaier@ams.com>
**/
(Cherrypicked commit from a1e01867211112691e80701a01ed9900655f7fe5)
Fixed compilation issue happened during integration.
Integration done by: bbasu and ldewangan
Change-Id: I68812519d7ff2263193d2b4c91da71037cfd43fb
Signed-off-by: Bibek Basu <bbasu@nvidia.com>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/328289
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/as3722-plat.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/mfd/as3722-plat.h b/include/linux/mfd/as3722-plat.h index cc57eb00ccde..47f2096f8a38 100644 --- a/include/linux/mfd/as3722-plat.h +++ b/include/linux/mfd/as3722-plat.h @@ -48,17 +48,11 @@ extern const struct regmap_config as3722_regmap_config; #define AS3722_EXT_CONTROL_ENABLE2 0x2 #define AS3722_EXT_CONTROL_ENABLE3 0x3 -struct as3722_rtc { - struct rtc_device *rtc; - int alarm_enabled; /* used for suspend/resume */ -}; - struct as3722 { struct device *dev; struct regmap *regmap; struct regmap_irq_chip_data *irq_data; struct regulator_dev *rdevs[AS3722_NUM_REGULATORS]; - struct as3722_rtc rtc; int chip_irq; }; |