[Balloon-svn] r1865 - balloon/branches/menuconfig2/package/k…

Author: nick
Date: 2012-05-01 17:46:24 +0100 (Tue, 01 May 2012)
New Revision: 1865

Modified:
balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3.patch
Log:
add poweroff to for TT 2.2 board

Modified: balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3.patch
===================================================================
--- balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3.patch    2012-05-01 16:35:54 UTC (rev 1864)
+++ balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3.patch    2012-05-01 16:46:24 UTC (rev 1865)
@@ -1,7 +1,7 @@
 Index: linux-2.6.39.4/arch/arm/mach-pxa/balloon3.c
 ===================================================================
---- linux-2.6.39.4.orig/arch/arm/mach-pxa/balloon3.c    2012-01-26 13:59:13.000000000 +0000
-+++ linux-2.6.39.4/arch/arm/mach-pxa/balloon3.c    2012-01-26 14:03:58.000000000 +0000
+--- linux-2.6.39.4.orig/arch/arm/mach-pxa/balloon3.c    2012-05-01 17:30:49.000000000 +0100
++++ linux-2.6.39.4/arch/arm/mach-pxa/balloon3.c    2012-05-01 17:30:55.000000000 +0100
 @@ -31,6 +31,7 @@
  #include <linux/mtd/nand.h>
  #include <linux/mtd/physmap.h>
@@ -10,7 +10,7 @@

#include <asm/setup.h>
#include <asm/mach-types.h>
-@@ -52,8 +53,11 @@
+@@ -52,8 +53,15 @@
#include <mach/irda.h>
#include <mach/ohci.h>

@@ -19,10 +19,14 @@
#include "generic.h"
#include "devices.h"
+#include "linux/delay.h"
++
++#ifdef CONFIG_MACH_BALLOON3_BUBBLE
++#include "linux/samosa_bus.h"
++#endif

/******************************************************************************
* Pin configuration
-@@ -67,6 +71,9 @@
+@@ -67,6 +75,9 @@

      /* Reset, configured as GPIO wakeup source */
      GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH,
@@ -32,7 +36,7 @@
  };

  /******************************************************************************
-@@ -211,7 +218,7 @@
+@@ -211,7 +222,7 @@
  #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
  static unsigned long balloon3_lcd_pin_config[] __initdata = {
      GPIOxx_LCD_TFT_16BPP,
@@ -41,7 +45,7 @@
  };

static struct pxafb_mode_info balloon3_lcd_modes[] = {
-@@ -275,6 +282,35 @@
+@@ -275,6 +286,35 @@
static inline void balloon3_lcd_init(void) {}
#endif

@@ -77,7 +81,7 @@
  /******************************************************************************
   * SD/MMC card controller
   ******************************************************************************/
-@@ -309,6 +345,22 @@
+@@ -309,6 +349,22 @@
   * USB Gadget
   ******************************************************************************/
  #if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE)
@@ -100,7 +104,7 @@
  static void balloon3_udc_command(int cmd)
  {
      if (cmd == PXA2XX_UDC_CMD_CONNECT)
-@@ -317,14 +369,8 @@
+@@ -317,14 +373,8 @@
          UP2OCR &= ~UP2OCR_DPPUE;
  }

@@ -115,7 +119,7 @@
      .gpio_pullup        = -1,
  };

-@@ -480,14 +526,14 @@
+@@ -480,14 +530,14 @@
  {
      int balloon3_irq = (d->irq - BALLOON3_IRQ(0));
      balloon3_irq_enabled &= ~(1 << balloon3_irq);
@@ -132,7 +136,7 @@
  }

static struct irq_chip balloon3_irq_chip = {
-@@ -526,7 +572,7 @@
+@@ -526,7 +576,7 @@

      pxa27x_init_irq();
      /* setup extra Balloon3 irqs */
@@ -141,7 +145,7 @@
          irq_set_chip_and_handler(irq, &balloon3_irq_chip,
                       handle_level_irq);
          set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
-@@ -550,22 +596,33 @@
+@@ -550,22 +600,33 @@
      .teardown    = NULL,
      .context    = NULL,
  };
@@ -178,7 +182,7 @@

/******************************************************************************
* NAND
-@@ -779,11 +836,146 @@
+@@ -779,11 +840,159 @@
static inline void balloon3_pmic_init(void) {}
#endif

@@ -253,6 +257,19 @@
 +
 +    /* switch off RS232 */
 +    gpio_set_value(BALLOON3_GPIO_RUN_232, 0);
++#ifdef CONFIG_MACH_BALLOON3_BUBBLE
++    while (1) {
++        // time periods in units of a samosa write
++        // clear - 2 time periods low
++        samosa8_write(0x12, 1 << 2);
++        samosa8_write(0x12, 1 << 2);
++        // set - 3 time periods high.
++        samosa8_write(0x13, 1 << 2);
++        samosa8_write(0x13, 1 << 2);
++        samosa8_write(0x13, 1 << 2);
++        
++    }
++#endif
 +    asm ( "mov r0,#0x7\n"
 +        "mcr p14, 0, r0, c7, c0, 0\n"
 +    );
@@ -325,7 +342,7 @@
      ARB_CNTRL = ARB_CORE_PARK | 0x234;

      pxa2xx_mfp_config(ARRAY_AND_SIZE(balloon3_pin_config));
-@@ -804,6 +996,7 @@
+@@ -804,6 +1013,7 @@
      balloon3_udc_init();
      balloon3_uhc_init();
      balloon3_cf_init();
@@ -333,7 +350,7 @@
  }

  static struct map_desc balloon3_io_desc[] __initdata = {
-@@ -821,6 +1014,61 @@
+@@ -821,6 +1031,61 @@
      iotable_init(balloon3_io_desc, ARRAY_SIZE(balloon3_io_desc));
  }

@@ -397,8 +414,8 @@
      .map_io        = balloon3_map_io,
 Index: linux-2.6.39.4/arch/arm/mach-pxa/include/mach/balloon3.h
 ===================================================================
---- linux-2.6.39.4.orig/arch/arm/mach-pxa/include/mach/balloon3.h    2012-01-26 13:59:13.000000000 +0000
-+++ linux-2.6.39.4/arch/arm/mach-pxa/include/mach/balloon3.h    2012-01-26 14:04:03.000000000 +0000
+--- linux-2.6.39.4.orig/arch/arm/mach-pxa/include/mach/balloon3.h    2012-05-01 17:30:49.000000000 +0100
++++ linux-2.6.39.4/arch/arm/mach-pxa/include/mach/balloon3.h    2012-05-01 17:30:55.000000000 +0100
 @@ -47,6 +47,19 @@
  #define BALLOON3_SAMOSA_ADDR_REG    (BALLOON3_FPGA_VIRT + 0x00c00000)
  #define BALLOON3_SAMOSA_DATA_REG    (BALLOON3_FPGA_VIRT + 0x00c00004)
@@ -472,8 +489,8 @@
  #endif
 Index: linux-2.6.39.4/arch/arm/mach-pxa/Kconfig
 ===================================================================
---- linux-2.6.39.4.orig/arch/arm/mach-pxa/Kconfig    2012-01-26 13:59:13.000000000 +0000
-+++ linux-2.6.39.4/arch/arm/mach-pxa/Kconfig    2012-01-26 14:02:20.000000000 +0000
+--- linux-2.6.39.4.orig/arch/arm/mach-pxa/Kconfig    2012-05-01 17:30:49.000000000 +0100
++++ linux-2.6.39.4/arch/arm/mach-pxa/Kconfig    2012-05-01 17:30:55.000000000 +0100
 @@ -56,6 +56,7 @@

  comment "Third Party Dev Platforms (sorted by vendor name)"
@@ -619,8 +636,8 @@
      select PXA27x
 Index: linux-2.6.39.4/sound/soc/pxa/Kconfig
 ===================================================================
---- linux-2.6.39.4.orig/sound/soc/pxa/Kconfig    2012-01-26 13:59:13.000000000 +0000
-+++ linux-2.6.39.4/sound/soc/pxa/Kconfig    2012-01-26 14:04:04.000000000 +0000
+--- linux-2.6.39.4.orig/sound/soc/pxa/Kconfig    2012-05-01 17:30:49.000000000 +0100
++++ linux-2.6.39.4/sound/soc/pxa/Kconfig    2012-05-01 17:30:55.000000000 +0100
 @@ -26,6 +26,14 @@
      tristate
      select PXA_SSP