[PATCH 4/4] ARM: OMAP: Update TSC2301 touchscreen config name in board-n800.c

[PATCH 4/4] ARM: OMAP: Update TSC2301 touchscreen config name in board-n800.c

[Jarkko Nikula]

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
---
 arch/arm/mach-omap2/board-n800.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index 69e5d36..bb805cf 100644
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -409,7 +409,7 @@ static struct platform_device n800_keypad_led_device = {
 };
 #endif
 
-#if defined(CONFIG_SPI_TSC2301_TOUCHSCREEN)
+#if defined(CONFIG_TOUCHSCREEN_TSC2301)
 static void __init n800_ts_set_config(void)
 {
 	const struct omap_lcd_config *conf;
-- 
1.4.4.4

Re: [PATCH 4/4] ARM: OMAP: Update TSC2301 touchscreen config name in board-n800.c

[Tony Lindgren]

* Jarkko Nikula <jarkko.nikula@nokia.com> [070322 05:17]:
> Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
> ---
>  arch/arm/mach-omap2/board-n800.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
> index 69e5d36..bb805cf 100644
> --- a/arch/arm/mach-omap2/board-n800.c
> +++ b/arch/arm/mach-omap2/board-n800.c
> @@ -409,7 +409,7 @@ static struct platform_device n800_keypad_led_device = {
>  };
>  #endif
>  
> -#if defined(CONFIG_SPI_TSC2301_TOUCHSCREEN)
> +#if defined(CONFIG_TOUCHSCREEN_TSC2301)
>  static void __init n800_ts_set_config(void)
>  {
>  	const struct omap_lcd_config *conf;

This is already applied now too.

Tony

Re: [PATCH 4/4] ARM: OMAP: Update TSC2301 touchscreen config name in board-n800.c

[Jarkko Nikula]

[-- Attachment #1: Type: text/plain, Size: 825 bytes --]

On Fri, 30 Mar 2007 15:13:46 -0400
"ext Tony Lindgren" <tony@atomide.com> wrote:

> * Jarkko Nikula <jarkko.nikula@nokia.com> [070322 05:17]:
> > Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
> > ---
> >  arch/arm/mach-omap2/board-n800.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> This is already applied now too.
> 
Not correctly :-)

It seems that you took "commit
64e78a98859a4ce028121a6b5d462b504f9b9343" from my first patchset
changing also TSC2301-mixer config name which was not required for
latter set.

This could be corrected by either reverting whole
64e78a98859a4ce028121a6b5d462b504f9b9343 and applying only this one:

http://linux.omap.com/pipermail/linux-omap-open-source/2007-March/009402.html

or by applying audio config name revert patch I'm attaching here.


-- 
Jarkko

[-- Attachment #2: 0001-ARM-OMAP-Revert-TSC2301-audio-config-name-change-in-board-n800-audio.c.txt --]
[-- Type: text/plain, Size: 1059 bytes --]

>From 5ce8f5744d8ec067389a67f83adb53545f95e0ad Mon Sep 17 00:00:00 2001
From: Jarkko Nikula <jarkko.nikula@nokia.com>
Date: Mon, 2 Apr 2007 09:59:38 +0300
Subject: [PATCH] ARM: OMAP: Revert TSC2301 audio config name change in board-n800-audio.c

Commit 64e78a98859a4ce028121a6b5d462b504f9b9343 was accidentally took
from older patchset where with the newer set TSC2301 audio config name
didn't change.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
---
 arch/arm/mach-omap2/board-n800-audio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-n800-audio.c b/arch/arm/mach-omap2/board-n800-audio.c
index 6bdf1c8..fa6ab86 100644
--- a/arch/arm/mach-omap2/board-n800-audio.c
+++ b/arch/arm/mach-omap2/board-n800-audio.c
@@ -31,7 +31,7 @@
 
 #include "../plat-omap/dsp/dsp_common.h"
 
-#if defined(CONFIG_SND_SOC_TSC2301) && defined(CONFIG_SND_OMAP24XX_EAC)
+#if defined(CONFIG_SPI_TSC2301_AUDIO) && defined(CONFIG_SND_OMAP24XX_EAC)
 #define AUDIO_ENABLED
 
 static struct clk *sys_clkout2;
-- 
1.4.4.4


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 4/4] ARM: OMAP: Update TSC2301 touchscreen config name in board-n800.c

[tony]

* Jarkko Nikula <jarkko.nikula@nokia.com> [070402 16:40]:
> On Fri, 30 Mar 2007 15:13:46 -0400
> "ext Tony Lindgren" <tony@atomide.com> wrote:
> 
> > * Jarkko Nikula <jarkko.nikula@nokia.com> [070322 05:17]:
> > > Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
> > > ---
> > >  arch/arm/mach-omap2/board-n800.c |    2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > This is already applied now too.
> > 
> Not correctly :-)
> 
> It seems that you took "commit
> 64e78a98859a4ce028121a6b5d462b504f9b9343" from my first patchset
> changing also TSC2301-mixer config name which was not required for
> latter set.
> 
> This could be corrected by either reverting whole
> 64e78a98859a4ce028121a6b5d462b504f9b9343 and applying only this one:
> 
> http://linux.omap.com/pipermail/linux-omap-open-source/2007-March/009402.html
> 
> or by applying audio config name revert patch I'm attaching here.

Thanks, I've applied the attached patch. I'l need to redo the
omap-upstream queue anyways to try to cut it down a bit...

Tony