diff options
Diffstat (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.35-OMAP-RX51-Add-Touch-Controller-in-SPI-board-info.patch')
| -rw-r--r-- | meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.35-OMAP-RX51-Add-Touch-Controller-in-SPI-board-info.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.35-OMAP-RX51-Add-Touch-Controller-in-SPI-board-info.patch b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.35-OMAP-RX51-Add-Touch-Controller-in-SPI-board-info.patch new file mode 100644 index 0000000000..1599c027c9 --- /dev/null +++ b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.35-OMAP-RX51-Add-Touch-Controller-in-SPI-board-info.patch @@ -0,0 +1,64 @@ +From 186ac697a023e7b95db72433fb8d4e8a9553826d Mon Sep 17 00:00:00 2001 +From: Roger Quadros <roger.quadros@nokia.com> +Date: Mon, 22 Mar 2010 17:16:25 +0200 +Subject: [PATCH 6/10] OMAP: RX51: Add Touch Controller in SPI board info + +From: Roger Quadros <roger.quadros@nokia.com> + +Patch-mainline: 2.6.35? +Git-repo: http://www.gitorious.org/linux-omap-dss2/linux/commit/a77ee8b332b62f3b10ffc15b27b889adf50cd013 + +The Touch controller and LCD Panel share the same SPI bus 1. +So, we need to define the touch controller in the SPI board info +else, the SPI bus will be contended due to invalid state of +Touch controller's Chip Select thus preventing the LCD panel +from working. + +Signed-off-by: Roger Quadros <roger.quadros@nokia.com> +--- + arch/arm/mach-omap2/board-rx51-peripherals.c | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c +index 6a41a0a..bdb1c54 100644 +--- a/arch/arm/mach-omap2/board-rx51-peripherals.c ++++ b/arch/arm/mach-omap2/board-rx51-peripherals.c +@@ -46,6 +46,7 @@ + enum { + RX51_SPI_WL1251, + RX51_SPI_MIPID, /* LCD panel */ ++ RX51_SPI_TSC2005, /* Touch Controller */ + }; + + static struct wl12xx_platform_data wl1251_pdata; +@@ -60,6 +61,11 @@ static struct omap2_mcspi_device_config mipid_mcspi_config = { + .single_channel = 1, + }; + ++static struct omap2_mcspi_device_config tsc2005_mcspi_config = { ++ .turbo_mode = 0, ++ .single_channel = 1, ++}; ++ + static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = { + [RX51_SPI_WL1251] = { + .modalias = "wl1251", +@@ -77,6 +83,15 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = { + .max_speed_hz = 6000000, + .controller_data = &mipid_mcspi_config, + }, ++ [RX51_SPI_TSC2005] = { ++ .modalias = "tsc2005", ++ .bus_num = 1, ++ .chip_select = 0, ++ /* .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),*/ ++ .max_speed_hz = 6000000, ++ .controller_data = &tsc2005_mcspi_config, ++ /* .platform_data = &tsc2005_config,*/ ++ }, + }; + + #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) +-- +1.6.0.4 + |