delete printk in alarm and add pulldown in xpt2046

diff --git a/drivers/input/touchscreen/xpt2046_ts_320X480.c b/drivers/input/touchscreen/xpt2046_ts_320X480.c
index 20079368df057d94e1a25f9a8c1f3b82da5230dc..44b7ad56139bd1b5e0359e2b32e75232359995d6 100755 (executable)
--- a/drivers/input/touchscreen/xpt2046_ts_320X480.c
+++ b/drivers/input/touchscreen/xpt2046_ts_320X480.c
@@ -744,6 +744,15 @@ static int __devinit setup_pendown(struct spi_device *spi, struct xpt2046 *ts)
                return err;
        }
 
+    err = gpio_direction_input(pdata->gpio_pendown);
+    if (err) {
+               dev_err(&spi->dev, "failed to switch GPIO to input%d\n",
+                               pdata->gpio_pendown);
+               return err;
+    }
+    
+    gpio_pull_updown(pdata->gpio_pendown,GPIOPullUp);
+
        ts->gpio_pendown = pdata->gpio_pendown;
        return 0;
 }

diff --git a/drivers/rtc/alarm.c b/drivers/rtc/alarm.c
index e1ca7f1b4021c181ae96d0079b8f6d41f258476f..d6c952763e54e61be7b78ded03447213ad0c76ac 100755 (executable)
--- a/drivers/rtc/alarm.c
+++ b/drivers/rtc/alarm.c
@@ -24,6 +24,12 @@
 #include <linux/sysdev.h>
 #include <linux/wakelock.h>
 
+#if 0
+#define DBG(x...)   DBG(x)
+#else
+#define DBG(x...)
+#endif
+
 #define ANDROID_ALARM_PRINT_ERROR (1U << 0)
 #define ANDROID_ALARM_PRINT_INIT_STATUS (1U << 1)
 #define ANDROID_ALARM_PRINT_TSET (1U << 2)
@@ -244,7 +250,7 @@ int rtc_change_time(struct timespec new_time)
 
        rtc_time_to_tm(new_time.tv_sec, &rtc_new_rtc_time);
 
-       printk("set rtc %ld %ld - rtc %02d:%02d:%02d %02d/%02d/%04d\n",
+       DBG("set rtc %ld %ld - rtc %02d:%02d:%02d %02d/%02d/%04d\n",
                new_time.tv_sec, new_time.tv_nsec,
                rtc_new_rtc_time.tm_hour, rtc_new_rtc_time.tm_min,
                rtc_new_rtc_time.tm_sec, rtc_new_rtc_time.tm_mon + 1,
@@ -266,7 +272,7 @@ int alarm_set_rtc(struct timespec new_time)
 
        rtc_time_to_tm(new_time.tv_sec, &rtc_new_rtc_time);
 
-       printk("set rtc %ld %ld - rtc %02d:%02d:%02d %02d/%02d/%04d\n",
+       DBG("set rtc %ld %ld - rtc %02d:%02d:%02d %02d/%02d/%04d\n",
                new_time.tv_sec, new_time.tv_nsec,
                rtc_new_rtc_time.tm_hour, rtc_new_rtc_time.tm_min,
                rtc_new_rtc_time.tm_sec, rtc_new_rtc_time.tm_mon + 1,
@@ -337,20 +343,20 @@ static enum hrtimer_restart alarm_timer_triggered(struct hrtimer *timer)
        struct alarm *alarm;
        unsigned long flags;
        ktime_t now;
-       printk("alarm_timer_triggered\n");
+       DBG("alarm_timer_triggered\n");
        spin_lock_irqsave(&alarm_slock, flags);
 
        base = container_of(timer, struct alarm_queue, timer);
        now = base->stopped ? base->stopped_time : hrtimer_cb_get_time(timer);
        now = ktime_sub(now, base->delta);
 
-       printk( "alarm_timer_triggered type %d at %lld\n",
+       DBG( "alarm_timer_triggered type %d at %lld\n",
                base - alarms, ktime_to_ns(now));
 
        while (base->first) {
                alarm = container_of(base->first, struct alarm, node);
                if (alarm->softexpires.tv64 > now.tv64) {
-                       printk( "don't call alarm, %pF, %lld (s %lld)\n",
+                       DBG( "don't call alarm, %pF, %lld (s %lld)\n",
                                alarm->function, ktime_to_ns(alarm->expires),
                                ktime_to_ns(alarm->softexpires));
                        break;
@@ -358,7 +364,7 @@ static enum hrtimer_restart alarm_timer_triggered(struct hrtimer *timer)
                base->first = rb_next(&alarm->node);
                rb_erase(&alarm->node, &base->alarms);
                RB_CLEAR_NODE(&alarm->node);
-               printk("call alarm, type %d, func %pF, %lld (s %lld)\n",
+               DBG("call alarm, type %d, func %pF, %lld (s %lld)\n",
                        alarm->type, alarm->function,
                        ktime_to_ns(alarm->expires),
                        ktime_to_ns(alarm->softexpires));
@@ -367,10 +373,10 @@ static enum hrtimer_restart alarm_timer_triggered(struct hrtimer *timer)
                spin_lock_irqsave(&alarm_slock, flags);
        }
        if (!base->first)
-               printk( "no more alarms of type %d\n", base - alarms);
+               DBG( "no more alarms of type %d\n", base - alarms);
        update_timer_locked(base, true);
        spin_unlock_irqrestore(&alarm_slock, flags);
-       printk("---alarm_timer_triggered---\n");
+       DBG("---alarm_timer_triggered---\n");
        return HRTIMER_NORESTART;
 }
 
@@ -396,7 +402,7 @@ static int alarm_suspend(struct platform_device *pdev, pm_message_t state)
        struct alarm_queue *wakeup_queue = NULL;
        struct alarm_queue *tmp_queue = NULL;
 
-       printk( "alarm_suspend(%p, %d)\n", pdev, state.event);
+       DBG( "alarm_suspend(%p, %d)\n", pdev, state.event);
 
        spin_lock_irqsave(&alarm_slock, flags);
        suspended = true;
@@ -431,7 +437,7 @@ static int alarm_suspend(struct platform_device *pdev, pm_message_t state)
                rtc_set_alarm(alarm_rtc_dev, &rtc_alarm);
                rtc_read_time(alarm_rtc_dev, &rtc_current_rtc_time);
                rtc_tm_to_time(&rtc_current_rtc_time, &rtc_current_time);
-               printk(
+               DBG(
                        "rtc alarm set at %ld, now %ld, rtc delta %ld.%09ld\n",
                        rtc_alarm_time, rtc_current_time,
                        rtc_delta.tv_sec, rtc_delta.tv_nsec);
@@ -452,7 +458,7 @@ static int alarm_suspend(struct platform_device *pdev, pm_message_t state)
                        spin_unlock_irqrestore(&alarm_slock, flags);
                }
        }
-       printk( "alarm_suspend over\n");
+       DBG( "alarm_suspend over\n");
        return err;
 }
 
@@ -469,7 +475,7 @@ static int alarm_shutdown(struct platform_device *pdev, pm_message_t state)
        struct alarm_queue *wakeup_queue = NULL;
        struct alarm_queue *tmp_queue = NULL;
 
-       printk( "alarm_suspend(%p, %d)\n", pdev, state.event);
+       DBG( "alarm_suspend(%p, %d)\n", pdev, state.event);
 
        spin_lock_irqsave(&alarm_slock, flags);
        suspended = true;
@@ -503,7 +509,7 @@ static int alarm_shutdown(struct platform_device *pdev, pm_message_t state)
                rtc_set_alarm(alarm_rtc_dev, &rtc_alarm);
                rtc_read_time(alarm_rtc_dev, &rtc_current_rtc_time);
                rtc_tm_to_time(&rtc_current_rtc_time, &rtc_current_time);
-               printk(
+               DBG(
                        "rtc alarm set at %ld, now %ld, rtc delta %ld.%09ld\n",
                        rtc_alarm_time, rtc_current_time,
                        rtc_delta.tv_sec, rtc_delta.tv_nsec);
@@ -524,7 +530,7 @@ static int alarm_shutdown(struct platform_device *pdev, pm_message_t state)
                        spin_unlock_irqrestore(&alarm_slock, flags);
                }
        }
-       printk( "alarm_suspend over\n");
+       DBG( "alarm_suspend over\n");
        return err;
 }
 static int alarm_resume(struct platform_device *pdev)
@@ -532,7 +538,7 @@ static int alarm_resume(struct platform_device *pdev)
        struct rtc_wkalrm alarm;
        unsigned long       flags;
 
-       printk( "alarm_resume(%p)\n", pdev);
+       DBG( "alarm_resume(%p)\n", pdev);
 
        memset(&alarm, 0, sizeof(alarm));
        alarm.enabled = 0;
@@ -617,7 +623,7 @@ static int __init alarm_late_init(void)
 {
        unsigned long   flags;
        struct timespec tmp_time, system_time;
-       printk("alarm_late_init\n");
+       DBG("alarm_late_init\n");
        /* this needs to run after the rtc is read at boot */
        spin_lock_irqsave(&alarm_slock, flags);
        /* We read the current rtc and system time so we can later calulate
@@ -631,7 +637,7 @@ static int __init alarm_late_init(void)
                        timespec_to_ktime(timespec_sub(tmp_time, system_time));
 
        spin_unlock_irqrestore(&alarm_slock, flags);
-       printk("---alarm_late_init----\n");
+       DBG("---alarm_late_init----\n");
        return 0;
 }
 
@@ -639,7 +645,7 @@ static int __init alarm_driver_init(void)
 {
        int err;
        int i;
-       printk("alarm_driver_init\n");
+       DBG("alarm_driver_init\n");
        for (i = 0; i < ANDROID_ALARM_SYSTEMTIME; i++) {
                hrtimer_init(&alarms[i].timer,
                                CLOCK_REALTIME, HRTIMER_MODE_ABS);
@@ -656,7 +662,7 @@ static int __init alarm_driver_init(void)
        err = class_interface_register(&rtc_alarm_interface);
        if (err < 0)
                goto err2;
-       printk("---alarm_driver_init---\n");
+       DBG("---alarm_driver_init---\n");
        return 0;
 
 err2: