Skip to content

Commit 61f7921

Browse files
committed
bravo: rtc fixes Evervolv#1
1 parent 09a2022 commit 61f7921

3 files changed

Lines changed: 9 additions & 21 deletions

File tree

arch/arm/configs/bravo_defconfig

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -632,10 +632,11 @@ CONFIG_EARLYSUSPEND=y
632632
# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
633633
CONFIG_FB_EARLYSUSPEND=y
634634
CONFIG_PM_SLEEP=y
635-
# CONFIG_PM_RUNTIME is not set
635+
CONFIG_PM_RUNTIME=y
636636
CONFIG_PM=y
637637
# CONFIG_PM_DEBUG is not set
638638
# CONFIG_APM_EMULATION is not set
639+
ONFIG_PM_RUNTIME_CLK=y
639640
# CONFIG_SUSPEND_TIME is not set
640641
CONFIG_ARCH_SUSPEND_POSSIBLE=y
641642
CONFIG_NET=y
@@ -2015,14 +2016,14 @@ CONFIG_RTC_LIB=y
20152016
CONFIG_RTC_CLASS=y
20162017
CONFIG_RTC_HCTOSYS=y
20172018
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
2018-
CONFIG_RTC_DEBUG=y
2019+
# CONFIG_RTC_DEBUG is not set
20192020

20202021
#
20212022
# RTC interfaces
20222023
#
2023-
# CONFIG_RTC_INTF_SYSFS is not set
2024-
# CONFIG_RTC_INTF_PROC is not set
2025-
# CONFIG_RTC_INTF_DEV is not set
2024+
CONFIG_RTC_INTF_SYSFS=y
2025+
CONFIG_RTC_INTF_PROC=y
2026+
CONFIG_RTC_INTF_DEV=y
20262027
CONFIG_RTC_INTF_ALARM=y
20272028
CONFIG_RTC_INTF_ALARM_DEV=y
20282029
# CONFIG_ANDROID_RTC_CHANGE_WAIT is not set

arch/arm/mach-msm/rpc_server_time_remote.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ static int handle_rpc_call(struct msm_rpc_server *server,
117117
"\tstamp = %lld\n",
118118
args->tick, args->stamp);
119119
getnstimeofday(&ts);
120-
//msmrtc_updateatsuspend(&ts);
121-
//rtc_hctosys();
120+
msmrtc_updateatsuspend(&ts);
121+
rtc_hctosys();
122122
getnstimeofday(&tv);
123123
/* Update the alarm information with the new time info. */
124124
//alarm_update_timedelta(ts, tv);

arch/arm/mach-msm/smd_rpcrouter.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@
5252
#include "smd_rpc_sym.h"
5353
#include "smd_private.h"
5454

55-
#if defined(CONFIG_MACH_BRAVO)
56-
#include "board-bravo.h"
57-
#endif
58-
5955
enum {
6056
SMEM_LOG = 1U << 0,
6157
RTR_DBG = 1U << 1,
@@ -250,11 +246,7 @@ static int rpcrouter_send_control_msg(struct rpcrouter_xprt_info *xprt_info,
250246
return 0;
251247

252248
if (!(msg->cmd == RPCROUTER_CTRL_CMD_HELLO) &&
253-
!xprt_info->initialized
254-
#if defined(CONFIG_MACH_BRAVO)
255-
&& (!(msg->cmd == RPCROUTER_CTRL_CMD_BYE))
256-
#endif
257-
) {
249+
!xprt_info->initialized) {
258250
printk(KERN_ERR "rpcrouter_send_control_msg(): Warning, "
259251
"router not initialized\n");
260252
return -EINVAL;
@@ -781,13 +773,8 @@ static int process_control_msg(struct rpcrouter_xprt_info *xprt_info,
781773
case RPCROUTER_CTRL_CMD_HELLO:
782774
RR("o HELLO PID %d\n", xprt_info->remote_pid);
783775
memset(&ctl, 0, sizeof(ctl));
784-
#if defined(CONFIG_MACH_BRAVO)
785-
ctl.cmd = RPCROUTER_CTRL_CMD_HELLO;
786-
rpcrouter_send_control_msg(xprt_info, &ctl);
787-
#else
788776
ctl.cmd = RPCROUTER_CTRL_CMD_HELLO;
789777
rpcrouter_send_control_msg(xprt_info, &ctl);
790-
#endif
791778
xprt_info->initialized = 1;
792779

793780
/* Send list of servers one at a time */

0 commit comments

Comments
 (0)