← Back to branch summary

~beagleboard-kernel/+junk/2.6-stable

« back to all changes in this revision

Viewing changes to patches/for_next/0062-OMAP3EVM-Set-TSC-wakeup-option-in-pad-config.patch

  • Committer: Robert Nelson
  • Date: 2011-05-30 18:22:18 UTC
  • Revision ID: robertcnelson@gmail.com-20110530182218-kl9c2elev8wckknd
Tags: 2.6.39-x0
2.6.39-x0 release

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/for_next/0062-OMAP3EVM-Set-TSC-wakeup-option-in-pad-config.patch
1
 
From 1042d05880650f782613a04b89753a869de71fdd Mon Sep 17 00:00:00 2001
2
 
From: Vaibhav Hiremath <hvaibhav@ti.com>
3
 
Date: Tue, 25 Jan 2011 17:37:41 +0000
4
 
Subject: [PATCH 062/258] OMAP3EVM: Set TSC wakeup option in pad config
5
 
 
6
 
Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up
7
 
functionality from touchscreen controller.
8
 
 
9
 
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
10
 
Signed-off-by: Tony Lindgren <tony@atomide.com>
11
 
---
12
 
 arch/arm/mach-omap2/board-omap3evm.c |    6 ++++--
13
 
 1 files changed, 4 insertions(+), 2 deletions(-)
14
 
 
15
 
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
16
 
index 4f2574c..d4a1157 100644
17
 
--- a/arch/arm/mach-omap2/board-omap3evm.c
18
 
+++ b/arch/arm/mach-omap2/board-omap3evm.c
19
 
@@ -771,7 +771,8 @@ static struct omap_board_mux omap35x_board_mux[] __initdata = {
20
 
                                OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
21
 
                                OMAP_PIN_OFF_WAKEUPENABLE),
22
 
        OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
23
 
-                               OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
24
 
+                               OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
25
 
+                               OMAP_PIN_OFF_WAKEUPENABLE),
26
 
        OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
27
 
                                OMAP_PIN_OFF_NONE),
28
 
        OMAP3_MUX(GPMC_WAIT2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
29
 
@@ -799,7 +800,8 @@ static struct omap_board_mux omap36x_board_mux[] __initdata = {
30
 
                                OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
31
 
                                OMAP_PIN_OFF_WAKEUPENABLE),
32
 
        OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
33
 
-                               OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
34
 
+                               OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
35
 
+                               OMAP_PIN_OFF_WAKEUPENABLE),
36
 
        /* AM/DM37x EVM: DSS data bus muxed with sys_boot */
37
 
        OMAP3_MUX(DSS_DATA18, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
38
 
        OMAP3_MUX(DSS_DATA19, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
39
 
1.7.1
40