From: Kevin Hilman <khilman@ti.com>
To: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
Date: Thu, 27 Jan 2011 10:42:58 -0800 [thread overview]
Message-ID: <87k4hqnq6l.fsf@ti.com> (raw)
In-Reply-To: <1295977061-11086-6-git-send-email-hvaibhav@ti.com> (Vaibhav Hiremath's message of "Tue, 25 Jan 2011 23:07:41 +0530")
Vaibhav Hiremath <hvaibhav@ti.com> writes:
> Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up
> functionality from touchscreen controller.
>
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> ---
> arch/arm/mach-omap2/board-omap3evm.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
> index 2a2efa9..5eddf93 100644
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@ -716,7 +716,8 @@ static struct omap_board_mux omap35x_board_mux[] __initdata = {
> OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> OMAP_PIN_OFF_WAKEUPENABLE),
> OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> - OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
> + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> + OMAP_PIN_OFF_WAKEUPENABLE),
This hunk doesn't apply because the code below (SYS_BOOT5, etc.) doesn't
exist in upstream code.
Kevin
> OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> OMAP_PIN_OFF_NONE),
> OMAP3_MUX(GPMC_WAIT2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> @@ -729,7 +730,8 @@ static struct omap_board_mux omap36x_board_mux[] __initdata = {
> OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> OMAP_PIN_OFF_WAKEUPENABLE),
> OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> - OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
> + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> + OMAP_PIN_OFF_WAKEUPENABLE),
> /* AM/DM37x EVM: DSS data bus muxed with sys_boot */
> OMAP3_MUX(DSS_DATA18, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
> OMAP3_MUX(DSS_DATA19, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
WARNING: multiple messages have this Message-ID (diff)
From: khilman@ti.com (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config
Date: Thu, 27 Jan 2011 10:42:58 -0800 [thread overview]
Message-ID: <87k4hqnq6l.fsf@ti.com> (raw)
In-Reply-To: <1295977061-11086-6-git-send-email-hvaibhav@ti.com> (Vaibhav Hiremath's message of "Tue, 25 Jan 2011 23:07:41 +0530")
Vaibhav Hiremath <hvaibhav@ti.com> writes:
> Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up
> functionality from touchscreen controller.
>
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> ---
> arch/arm/mach-omap2/board-omap3evm.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
> index 2a2efa9..5eddf93 100644
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@ -716,7 +716,8 @@ static struct omap_board_mux omap35x_board_mux[] __initdata = {
> OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> OMAP_PIN_OFF_WAKEUPENABLE),
> OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> - OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
> + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> + OMAP_PIN_OFF_WAKEUPENABLE),
This hunk doesn't apply because the code below (SYS_BOOT5, etc.) doesn't
exist in upstream code.
Kevin
> OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> OMAP_PIN_OFF_NONE),
> OMAP3_MUX(GPMC_WAIT2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> @@ -729,7 +730,8 @@ static struct omap_board_mux omap36x_board_mux[] __initdata = {
> OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> OMAP_PIN_OFF_WAKEUPENABLE),
> OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
> - OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
> + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
> + OMAP_PIN_OFF_WAKEUPENABLE),
> /* AM/DM37x EVM: DSS data bus muxed with sys_boot */
> OMAP3_MUX(DSS_DATA18, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
> OMAP3_MUX(DSS_DATA19, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
next prev parent reply other threads:[~2011-01-27 18:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-25 17:37 [PATCH 0/5] OMAP3EVM: Board bug fixes/enhancements Vaibhav Hiremath
2011-01-25 17:37 ` Vaibhav Hiremath
2011-01-25 17:37 ` [PATCH 1/5] OMAP:board-omap3evm: Change TWL related gpio API's to gpio*_cansleep Vaibhav Hiremath
2011-01-25 17:37 ` Vaibhav Hiremath
2011-01-28 7:56 ` Varadarajan, Charulatha
2011-01-28 7:56 ` Varadarajan, Charulatha
2011-01-25 17:37 ` [PATCH 2/5] OMAP3EVM: Add vio regulator supply required for ads7846 TSC driver Vaibhav Hiremath
2011-01-25 17:37 ` Vaibhav Hiremath
2011-01-25 17:37 ` [PATCH 3/5] AM/DM37x: DSS mux configuration for >Rev-B processor cards Vaibhav Hiremath
2011-01-25 17:37 ` Vaibhav Hiremath
2011-01-25 17:37 ` [PATCH 4/5] OMAP3EVM: Made backlight GPIO default state to off Vaibhav Hiremath
2011-01-25 17:37 ` Vaibhav Hiremath
2011-01-25 17:37 ` [PATCH 5/5] OMAP3EVM: Set TSC wakeup option in pad config Vaibhav Hiremath
2011-01-25 17:37 ` Vaibhav Hiremath
2011-01-27 18:42 ` Kevin Hilman [this message]
2011-01-27 18:42 ` Kevin Hilman
2011-02-17 22:19 ` Tony Lindgren
2011-02-17 22:19 ` Tony Lindgren
2011-02-22 6:01 ` Hiremath, Vaibhav
2011-02-22 6:01 ` Hiremath, Vaibhav
2011-01-27 18:41 ` [PATCH 0/5] OMAP3EVM: Board bug fixes/enhancements Kevin Hilman
2011-01-27 18:41 ` Kevin Hilman
2011-01-27 18:46 ` Hiremath, Vaibhav
2011-01-27 18:46 ` Hiremath, Vaibhav
2011-01-27 20:05 ` Kevin Hilman
2011-01-27 20:05 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k4hqnq6l.fsf@ti.com \
--to=khilman@ti.com \
--cc=hvaibhav@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.