diff options
| author | David Jung <djung@nvidia.com> | 2013-05-17 12:16:01 -0700 |
|---|---|---|
| committer | Harshada Kale <hkale@nvidia.com> | 2013-06-10 08:10:13 -0700 |
| commit | 1c086ecaffbe9248a234d65593051e02a59304b3 (patch) | |
| tree | e6cfb755437c07aa3d8ba14d41b3458fe6c13937 | |
| parent | 247c34157a220978c25fcf95982d214438f0a21b (diff) | |
input: touch: maxim: update cpu boost
Nvidia change to update cpu boost to use MSC Activity
Bug 1290845
Bug 1302936
Change-Id: I31e71d7801c80db0fd32d17bb12a628123eac7cf
Signed-off-by: David Jung <djung@nvidia.com>
Reviewed-on: http://git-master/r/234302
(cherry picked from commit 38393a0bcefad477254a19b563ed2842e355c62b)
Reviewed-on: http://git-master/r/229856
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Yogish Kulkarni <yogishk@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Jinyoung Park <jinyoungp@nvidia.com>
Reviewed-by: Robert Collins <rcollins@nvidia.com>
Reviewed-by: Li Li (SW-TEGRA) <lli5@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
| -rw-r--r-- | drivers/input/touchscreen/maxim_sti.c | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c index 87552f5e4944..79d2126d1975 100644 --- a/drivers/input/touchscreen/maxim_sti.c +++ b/drivers/input/touchscreen/maxim_sti.c @@ -33,11 +33,7 @@ \****************************************************************************/ #define INPUT_ENABLE_DISABLE 1 -#define CPU_BOOST 1 - -#if CPU_BOOST -#include <linux/pm_qos.h> -#endif +#define NV_ENABLE_CPU_BOOST 1 /****************************************************************************\ * Device context structure, globals, and macros * @@ -75,11 +71,6 @@ struct dev_data { struct task_struct *thread; struct sched_param thread_sched; struct list_head dev_list; -#if CPU_BOOST - struct pm_qos_request cpus_req; - struct pm_qos_request freq_req; - unsigned long boost_freq; -#endif struct regulator *reg_avdd; struct regulator *reg_dvdd; }; @@ -1096,9 +1087,8 @@ static void service_irq(struct dev_data *dd) u16 status, test, address, xbuf; int ret, ret2; -#if CPU_BOOST - pm_qos_update_request_timeout(&dd->cpus_req, 1, 10000); - pm_qos_update_request_timeout(&dd->freq_req, dd->boost_freq, 10000); +#ifdef NV_ENABLE_CPU_BOOST + input_event(dd->input_dev, EV_MSC, MSC_ACTIVITY, 1); #endif ret = dd->chip.read(dd, dd->irq_param[0], (u8 *)&status, @@ -1361,15 +1351,6 @@ static int probe(struct spi_device *spi) if (ret < 0) goto nl_failure; -#if CPU_BOOST - /* initialize PM QOS */ - dd->boost_freq = pm_qos_request(PM_QOS_CPU_FREQ_MAX); - pm_qos_add_request(&dd->cpus_req, PM_QOS_MIN_ONLINE_CPUS, - PM_QOS_DEFAULT_VALUE); - pm_qos_add_request(&dd->freq_req, PM_QOS_CPU_FREQ_MIN, - PM_QOS_DEFAULT_VALUE); -#endif - /* Netlink: initialize incoming skb queue */ skb_queue_head_init(&dd->incoming_skb_queue); @@ -1429,13 +1410,6 @@ static int remove(struct spi_device *spi) if (dd->irq_registered) free_irq(dd->spi->irq, dd); -#if CPU_BOOST - if (dd->boost_freq != 0) { - pm_qos_remove_request(&dd->freq_req); - pm_qos_remove_request(&dd->cpus_req); - } -#endif - stop_scan_canned(dd); spin_lock_irqsave(&dev_lock, flags); |