diff options
| author | Zhou Jingyu <b02241@freescale.com> | 2011-03-02 16:28:25 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 19:53:52 +0800 |
| commit | e46c868419024af419283854a62a2ea525a33304 (patch) | |
| tree | 2f012baeae2c810eed20f81827602580bbe69d47 /drivers/rtc | |
| parent | 3b91b5ac920ba4e716afb8618ee10d6fb7711852 (diff) | |
ENGR00141391-2 PMIC: porting da9053 to i.mx platform
Fix da9053 backlight Kconfig error
porting da9052 regulator driver
Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com>
Acked-by: Lily Zhang <r58066@freescale.com>
Diffstat (limited to 'drivers/rtc')
| -rwxr-xr-x[-rw-r--r--] | drivers/rtc/Kconfig | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | drivers/rtc/Makefile | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | drivers/rtc/rtc-da9052.c | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index f2e0eaf6134e..fd0c4736a144 100644..100755 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -1041,6 +1041,13 @@ config RTC_DRV_LPC32XX This driver can also be buillt as a module. If so, the module will be called rtc-lpc32xx. +config RTC_DRV_DA9052 + tristate "Dialog DA9052 RTC" + depends on PMIC_DIALOG + help + Say y here to support the RTC found on + Dialog Semiconductor DA9052 PMIC. + config RTC_DRV_TEGRA tristate "NVIDIA Tegra Internal RTC driver" depends on RTC_CLASS && ARCH_TEGRA diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 7e8626d1444e..a0e2303c926f 100644..100755 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -109,3 +109,4 @@ obj-$(CONFIG_RTC_DRV_WM831X) += rtc-wm831x.o obj-$(CONFIG_RTC_DRV_WM8350) += rtc-wm8350.o obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o obj-$(CONFIG_RTC_DRV_MXC_V2) += rtc-mxc_v2.o +obj-$(CONFIG_RTC_DRV_DA9052) += rtc-da9052.o diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c index be80c228d5a3..952a106ebb19 100644..100755 --- a/drivers/rtc/rtc-da9052.c +++ b/drivers/rtc/rtc-da9052.c @@ -440,7 +440,7 @@ static int da9052_rtc_class_ops_gettime (struct device *dev, struct rtc_time *rtc_tm) { int ret; - struct da9052 *da9052 = dev->parent->driver_data; + struct da9052 *da9052 = dev_get_drvdata(dev->parent); ret = da9052_rtc_gettime(da9052, rtc_tm); if (ret) return ret; @@ -451,7 +451,7 @@ static int da9052_rtc_class_ops_gettime static int da9052_rtc_class_ops_settime(struct device *dev, struct rtc_time *tm) { int ret; - struct da9052 *da9052 = dev->parent->driver_data; + struct da9052 *da9052 = dev_get_drvdata(dev->parent); ret = da9052_rtc_settime(da9052, tm); return ret; @@ -461,7 +461,7 @@ static int da9052_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) { int ret; struct rtc_time *tm = &alrm->time; - struct da9052 *da9052 = dev->parent->driver_data; + struct da9052 *da9052 = dev_get_drvdata(dev->parent); ret = da9052_alarm_gettime(da9052, tm); if (ret) @@ -477,7 +477,7 @@ static int da9052_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) { int ret = 0; struct rtc_time *tm = &alrm->time; - struct da9052 *da9052 = dev->parent->driver_data; + struct da9052 *da9052 = dev_get_drvdata(dev->parent); ret = da9052_alarm_settime(da9052, tm); |