Re: [PATCH 84/90] ARM: OMAP: Update changed TSC2301 config names in N800 board files

Tony Lindgren
2007-04-05T15:48:35Z

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

* Jarkko Nikula <jarkko.nikula@nokia.com> [070405 02:12]:
> On Wed, 4 Apr 2007 14:06:03 -0400
> "ext Tony Lindgren" <tony@atomide.com> wrote:
>
> > From: Jarkko Nikula <jarkko.nikula@nokia.com>
> >
> > Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > ---
> > arch/arm/mach-omap2/board-n800-audio.c | 2 +-
> > arch/arm/mach-omap2/board-n800.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> Tony, I don't think so that we would like to use that one even it
> was accidentally pushed into linux-omap tree and corrected later on
> with another patch?

Yeah, let's leave out unnecessary back and forth changes :)

> Below is the patch which fits better here. We don't want to change
> CONFIG_SPI_TSC2301_AUDIO -> CONFIG_SND_SOC_TSC2301 until there is
> real SOC driver for TSC2301 audio.

Thanks, I've refreshed it.

Tony

[-- Attachment #2: 0084-ARM-OMAP-Update-changed-TSC2301-config-names-in-N800-board-files.txt --]
[-- Type: text/plain, Size: 968 bytes --]

>From 9c775cb960d0243e2d8ffa9492fe58e63ea7cbda Mon Sep 17 00:00:00 2001
From: Jarkko Nikula <jarkko.nikula@nokia.com>
Date: Thu, 5 Apr 2007 08:48:43 +0300
Subject: [PATCH] ARM: OMAP: Update TSC2301 touchscreen config name in N800 board file

Update TSC2301 touchscreen config name in N800 board file

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.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