linux 3.0: refresh all patches against 3.0.7

[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-3.0 / ulcd / 0002-WIP-omap-beagleboard-add-bbtoys-ulcd-lite-support.patch

diff --git a/recipes-kernel/linux/linux-3.0/ulcd/0002-WIP-omap-beagleboard-add-bbtoys-ulcd-lite-support.patch b/recipes-kernel/linux/linux-3.0/ulcd/0002-WIP-omap-beagleboard-add-bbtoys-ulcd-lite-support.patch
index d6aace3ca5949dd4a8bd8f0e68b097fddc705506..fcff83d810af4566ab9ab7cb21a683dc33b81609 100644 (file)
--- a/recipes-kernel/linux/linux-3.0/ulcd/0002-WIP-omap-beagleboard-add-bbtoys-ulcd-lite-support.patch
+++ b/recipes-kernel/linux/linux-3.0/ulcd/0002-WIP-omap-beagleboard-add-bbtoys-ulcd-lite-support.patch
@@ -1,7 +1,7 @@
-From 2ced51c12594c56d15b5376a5ff72aedddf41b6a Mon Sep 17 00:00:00 2001
+From 8c300d702932f9395d4fa12e4d1a4041da72f34c Mon Sep 17 00:00:00 2001
 From: Jason Kridner <jdk@ti.com>
 Date: Mon, 12 Sep 2011 10:28:14 -0400
-Subject: [PATCH 2/2] WIP: omap: beagleboard: add bbtoys ulcd-lite support
+Subject: [PATCH 2/4] WIP: omap: beagleboard: add bbtoys ulcd-lite support
 
 Added support for the BeagleBoardToys ULCD-Lite.
 * Added ThreeFiveCorp s9700rtwv35tr-01b panel to
@@ -22,7 +22,7 @@ Cc: Koen Kooi <koen@dominion.thruhere.net>
  2 files changed, 137 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 9712099..8c0d1a3 100644
+index 0124060..8b30b4c 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -35,6 +35,7 @@
@@ -49,7 +49,7 @@ index 9712099..8c0d1a3 100644
  };
  
  /*
-@@ -477,9 +482,53 @@ static struct omap_dss_device beagle_tv_device = {
+@@ -471,9 +476,53 @@ static struct omap_dss_device beagle_tv_device = {
        .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
  };
  
@@ -103,7 +103,7 @@ index 9712099..8c0d1a3 100644
  };
  
  static struct omap_dss_board_info beagle_dss_data = {
-@@ -496,6 +545,11 @@ static void __init beagle_display_init(void)
+@@ -490,6 +539,11 @@ static void __init beagle_display_init(void)
                             "DVI reset");
        if (r < 0)
                printk(KERN_ERR "Unable to get DVI reset GPIO\n");
@@ -115,7 +115,7 @@ index 9712099..8c0d1a3 100644
  }
  
  #include "sdram-micron-mt46h32m32lf-6.h"
-@@ -654,6 +708,53 @@ static struct i2c_board_info __initdata beagle_i2c2_zippy[] = {
+@@ -648,6 +702,53 @@ static struct i2c_board_info __initdata beagle_i2c2_zippy[] = {
  static struct i2c_board_info __initdata beagle_i2c2_zippy[] = {};
  #endif
  
@@ -169,7 +169,7 @@ index 9712099..8c0d1a3 100644
  static int __init omap3_beagle_i2c_init(void)
  {
        omap3_pmic_get_config(&beagle_twldata,
-@@ -823,6 +924,10 @@ static void __init omap3_beagle_init(void)
+@@ -817,6 +918,10 @@ static void __init omap3_beagle_init(void)
  
        gpio_buttons[0].gpio = beagle_config.usr_button_gpio;
  
@@ -180,7 +180,7 @@ index 9712099..8c0d1a3 100644
        platform_add_devices(omap3_beagle_devices,
                        ARRAY_SIZE(omap3_beagle_devices));
        omap_display_init(&beagle_dss_data);
-@@ -898,6 +1003,13 @@ static void __init omap3_beagle_init(void)
+@@ -892,6 +997,13 @@ static void __init omap3_beagle_init(void)
                platform_device_register(&omap_vwlan_device);
        }
  
@@ -231,5 +231,5 @@ index 9c90f75..82c1ac3 100644
  
  struct panel_drv_data {
 -- 
-1.7.4.1
+1.6.6.1