[Feature][ZXW-88]merge P50 version
Only Configure: No
Affected branch: master
Affected module: unknown
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I34667719d9e0e7e29e8e4368848601cde0a48408
diff --git a/ap/os/linux/linux-3.4.x/drivers/rtc/zx234290-rtc.c b/ap/os/linux/linux-3.4.x/drivers/rtc/zx234290-rtc.c
old mode 100644
new mode 100755
index ddfa780..54428db
--- a/ap/os/linux/linux-3.4.x/drivers/rtc/zx234290-rtc.c
+++ b/ap/os/linux/linux-3.4.x/drivers/rtc/zx234290-rtc.c
@@ -1111,6 +1111,9 @@
rtc->max_user_freq = 64; //32768;//32k clock
zx234290_rtc_irqno = zx234290_rtc.zx234290->chip_irq;
platform_set_drvdata(pdev, rtc);
+#ifdef _USE_VEHICLE_DC
+ printk("rtc get time only probe ok!\n");
+#else
ret = zx234290_rtc_request_irq(pdev, rtc);
if (ret)
{
@@ -1120,6 +1123,8 @@
zx234290_rtc_write_register(ZX234290_REG_ADDR_RTC_CTRL1, 0, 0xff);
zx234290_rtc_setuie(&pdev->dev, 0);
zx234290_rtc_enable(&pdev->dev, 0);
+#endif
+
sema_init(&timerSemaphore,0);
//zx234290_rtc_ioctl(NULL,ZX234290_SET_TIMER,20);
return 0;
diff --git a/ap/os/linux/linux-3.4.x/drivers/rtc/zx234290-rtc.h b/ap/os/linux/linux-3.4.x/drivers/rtc/zx234290-rtc.h
old mode 100644
new mode 100755
index 4e68c8e..3233c6e
--- a/ap/os/linux/linux-3.4.x/drivers/rtc/zx234290-rtc.h
+++ b/ap/os/linux/linux-3.4.x/drivers/rtc/zx234290-rtc.h
@@ -42,7 +42,7 @@
#define ZX234290_RTC_TIME_CENTURY_WID (1)
#define ZX234290_RTC_TIME_YEAR_LSH (0)
-#define ZX234290_RTC_TIME_YEAR_WID (7)
+#define ZX234290_RTC_TIME_YEAR_WID (8)
#define ZX234290_RTC_TIME_WEEKDAY_LSH (0)
#define ZX234290_RTC_TIME_WEEKDAY_WID (3)