recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0045-beaglebone-allow-capes-to-disable-w1-gpio.patch

   1 From 1b32708444a02b6e42cdd76272a2f09768a3474a Mon Sep 17 00:00:00 2001
   2 From: Koen Kooi <koen@dominion.thruhere.net>
   3 Date: Fri, 18 May 2012 12:39:25 +0200
   4 Subject: [PATCH 45/79] beaglebone: allow capes to disable w1-gpio
   5
   6 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
   7 ---
   8  arch/arm/mach-omap2/board-am335xevm.c |    7 +++++--
   9  1 file changed, 5 insertions(+), 2 deletions(-)
  10
  11 diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
  12 index 5bb71b1..5c89494 100644
  13 --- a/arch/arm/mach-omap2/board-am335xevm.c
  14 +++ b/arch/arm/mach-omap2/board-am335xevm.c
  15 @@ -498,7 +498,7 @@ static int capecount = 0;
  16  static bool beaglebone_tsadcpins_free = 1;
  17  static bool beaglebone_leds_free = 1;
  18  static bool beaglebone_spi1_free = 1;
  19 -
  20 +static bool beaglebone_w1gpio_free = 1;
  21
  22  #define GP_EVM_REV_IS_1_0              0x1
  23  #define GP_EVM_REV_IS_1_0A             0x1
  24 @@ -1727,6 +1727,7 @@ static void lcd7leds_init(int evm_id, int profile )
  25
  26  static void bonew1_gpio_init(int evm_id, int profile )
  27  {
  28 +       beaglebone_w1gpio_free = 0;
  29         int err;
  30         setup_pin_mux(w1_gpio_pin_mux);
  31         err = platform_device_register(&bone_w1_device);
  32 @@ -2258,6 +2259,9 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context
  33                                 setup_pin_mux(spi1_pin_mux);
  34                                 spi_register_board_info(bone_spidev2_info, ARRAY_SIZE(bone_spidev2_info));
  35                         }
  36 +                       if(beaglebone_w1gpio_free == 1) {
  37 +                               bonew1_gpio_init(0,0);
  38 +                       }
  39                 }
  40                 return;
  41         }
  42 @@ -2831,7 +2835,6 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = {
  43         {usb1_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
  44         {i2c2_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
  45         {mmc0_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
  46 -       {bonew1_gpio_init, DEV_ON_BASEBOARD, PROFILE_ALL},
  47         {NULL, 0, 0},
  48  };
  49
  50 --
  51 1.7.10
  52