recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0070-beaglebone-fix-buttons-spidev-clash-when-using-mcasp.patch

   1 From d99bad03ee2f3cc3d9a61879e53e4795a05eaed3 Mon Sep 17 00:00:00 2001
   2 From: Koen Kooi <koen@dominion.thruhere.net>
   3 Date: Wed, 6 Jun 2012 11:20:21 +0200
   4 Subject: [PATCH 70/70] beaglebone: fix buttons/spidev clash when using
   5  mcasp0_axr0.gpio3_16
   6
   7 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
   8 ---
   9  arch/arm/mach-omap2/board-am335xevm.c |   13 +++++++------
  10  1 files changed, 7 insertions(+), 6 deletions(-)
  11
  12 diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
  13 index 51bfa8b..7fd611f 100644
  14 --- a/arch/arm/mach-omap2/board-am335xevm.c
  15 +++ b/arch/arm/mach-omap2/board-am335xevm.c
  16 @@ -1051,12 +1051,11 @@ static void volume_keys_init(int evm_id, int profile)
  17
  18  /* pinmux for lcd7 keys */
  19  static struct pinmux_config lcd7_keys_pin_mux[] = {
  20 -       {"gpmc_a0.gpio1_16",  OMAP_MUX_MODE7 | AM33XX_PIN_INPUT},
  21 -       {"gpmc_a1.gpio1_17",    OMAP_MUX_MODE7 | AM33XX_PIN_INPUT},
  22 -       {"gpmc_a3.gpio1_19",  OMAP_MUX_MODE7 | AM33XX_PIN_INPUT},
  23 -       {"mcasp0_axr0.gpio3_16",    OMAP_MUX_MODE7 | AM33XX_PIN_INPUT},
  24 -       {"mcasp0_fsr.gpio3_19",    OMAP_MUX_MODE7 | AM33XX_PIN_INPUT},
  25 -       {"gpmc_ben1.gpio1_28",    OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT},
  26 +       {"gpmc_a0.gpio1_16",  OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //left
  27 +       {"gpmc_a1.gpio1_17",    OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //right
  28 +       {"gpmc_a3.gpio1_19",  OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //up
  29 +       {"mcasp0_axr0.gpio3_16",    OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //down
  30 +       {"mcasp0_fsr.gpio3_19",    OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //enter
  31         {NULL, 0},
  32  };
  33
  34 @@ -2738,6 +2737,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context
  35                 pr_info("BeagleBone cape: Registering gpio-keys for LCD cape\n");
  36                 beaglebone_lcd7_keys_init(0,0);
  37
  38 +               beaglebone_spi1_free = 0;
  39                 // A1 or newer
  40                 beaglebone_leds_free = 0;
  41                 lcd7leds_init(0,0);
  42 @@ -2765,6 +2765,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context
  43                         if (err)
  44                                 pr_err("failed to register gpio keys for LCD3 rev A1 or later cape\n");
  45                 }
  46 +               beaglebone_spi1_free = 0;
  47                 beaglebone_leds_free = 0;
  48                 lcd3leds_init(0,0);
  49         }
  50 --
  51 1.7.7.6
  52