code.ossystems Code Review - openembedded-core.git/blob

   1 From 186ac697a023e7b95db72433fb8d4e8a9553826d Mon Sep 17 00:00:00 2001
   2 From: Roger Quadros <roger.quadros@nokia.com>
   3 Date: Mon, 22 Mar 2010 17:16:25 +0200
   4 Subject: [PATCH 6/10] OMAP: RX51: Add Touch Controller in SPI board info
   5
   6 From: Roger Quadros <roger.quadros@nokia.com>
   7
   8 Patch-mainline: 2.6.35?
   9 Git-repo: http://www.gitorious.org/linux-omap-dss2/linux/commit/a77ee8b332b62f3b10ffc15b27b889adf50cd013
  10
  11 The Touch controller and LCD Panel share the same SPI bus 1.
  12 So, we need to define the touch controller in the SPI board info
  13 else, the SPI bus will be contended due to invalid state of
  14 Touch controller's Chip Select thus preventing the LCD panel
  15 from working.
  16
  17 Signed-off-by: Roger Quadros <roger.quadros@nokia.com>
  18 ---
  19  arch/arm/mach-omap2/board-rx51-peripherals.c |   15 +++++++++++++++
  20  1 files changed, 15 insertions(+), 0 deletions(-)
  21
  22 diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
  23 index 6a41a0a..bdb1c54 100644
  24 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
  25 +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
  26 @@ -46,6 +46,7 @@
  27  enum {
  28         RX51_SPI_WL1251,
  29         RX51_SPI_MIPID,         /* LCD panel */
  30 +       RX51_SPI_TSC2005,       /* Touch Controller */
  31  };
  32
  33  static struct wl12xx_platform_data wl1251_pdata;
  34 @@ -60,6 +61,11 @@ static struct omap2_mcspi_device_config mipid_mcspi_config = {
  35         .single_channel = 1,
  36  };
  37
  38 +static struct omap2_mcspi_device_config tsc2005_mcspi_config = {
  39 +       .turbo_mode     = 0,
  40 +       .single_channel = 1,
  41 +};
  42 +
  43  static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {
  44         [RX51_SPI_WL1251] = {
  45                 .modalias               = "wl1251",
  46 @@ -77,6 +83,15 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {
  47                 .max_speed_hz           = 6000000,
  48                 .controller_data        = &mipid_mcspi_config,
  49         },
  50 +       [RX51_SPI_TSC2005] = {
  51 +               .modalias               = "tsc2005",
  52 +               .bus_num                = 1,
  53 +               .chip_select            = 0,
  54 +               /* .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),*/
  55 +               .max_speed_hz           = 6000000,
  56 +               .controller_data        = &tsc2005_mcspi_config,
  57 +               /* .platform_data = &tsc2005_config,*/
  58 +       },
  59  };
  60
  61  #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
  62 --
  63 1.6.0.4
  64