linux-omap-psp 2.6.32: rediff touchbook and beagleboard patches, tweak beagleboard defconfig

66 files changed, 1614 insertions, 346 deletions

diff --git a/recipes/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch b/recipes/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch
index 5e81a16357..c406af1a15 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch
@@ -1,7 +1,7 @@
-From 6942ec9d19faef80770ae0f2302790d8ec73a9a7 Mon Sep 17 00:00:00 2001
+From 03e3ae2685bbd9586d520b0dd081593b814240b3 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Fri, 30 Apr 2010 11:12:24 +0200
-Subject: [PATCH 01/45] Revert "omap3: beagle: Fix compile-time errors"
+Subject: [PATCH 01/43] Revert "omap3: beagle: Fix compile-time errors"
 
 This commit clashes with the other beagle patches we apply on top
 
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0002-board-omap3touchbook-make-it-build-against-TI-linux-.patch b/recipes/linux/linux-omap-psp-2.6.32/0002-board-omap3touchbook-make-it-build-against-TI-linux-.patch
index da4fc189d7..f016e0edce 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0002-board-omap3touchbook-make-it-build-against-TI-linux-.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0002-board-omap3touchbook-make-it-build-against-TI-linux-.patch
@@ -1,7 +1,7 @@
-From c5438f97d0ace3b414b13ef59a58427b9fd5b94b Mon Sep 17 00:00:00 2001
+From ad2b9548c700dc424209e543d10ab14c848895a5 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <k-kooi@ti.com>
 Date: Sat, 30 Jan 2010 15:49:15 +0100
-Subject: [PATCH 02/45] board-omap3touchbook: make it build against TI linux-omap 2.6.32-PSP
+Subject: [PATCH 02/43] board-omap3touchbook: make it build against TI linux-omap 2.6.32-PSP
 
 ---
  arch/arm/mach-omap2/board-omap3touchbook.c |   11 +++++++++--
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0003-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch b/recipes/linux/linux-omap-psp-2.6.32/0003-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch
index ba280ff546..0e7a8b2943 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0003-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0003-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch
@@ -1,7 +1,7 @@
-From 48e1df47cf683e4640ec3ae403b2e6dea7432d0c Mon Sep 17 00:00:00 2001
+From 95d7fc0cb0c4367c378ed640d6bb49ab6dc100dc Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <sakoman@gmail.com>
 Date: Tue, 15 Dec 2009 15:34:29 -0800
-Subject: [PATCH 03/45] ARM: OMAP: add support for TCT Zippy to Beagle board file
+Subject: [PATCH 03/43] ARM: OMAP: add support for TCT Zippy to Beagle board file
 
 Signed-off-by: Steve Sakoman <sakoman@gmail.com>
 ---
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0004-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch b/recipes/linux/linux-omap-psp-2.6.32/0004-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch
index ab88739b73..f2ed1914f9 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0004-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0004-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch
@@ -1,7 +1,7 @@
-From 97113a211c7fa07bc4fd34ea8fbe87551eec635d Mon Sep 17 00:00:00 2001
+From 7ca7040b3382fabbaa37dfda2c80cc4433b16d2e Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 17 Dec 2009 12:40:24 -0800
-Subject: [PATCH 04/45] ARM: OMAP: Make beagle u-boot partition writable
+Subject: [PATCH 04/43] ARM: OMAP: Make beagle u-boot partition writable
 
 ---
  arch/arm/mach-omap2/board-omap3beagle.c |    1 -
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0005-board-omap3-beagle-add-DSS2-support.patch b/recipes/linux/linux-omap-psp-2.6.32/0005-board-omap3-beagle-add-DSS2-support.patch
index 01d95566ca..e9a1715c97 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0005-board-omap3-beagle-add-DSS2-support.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0005-board-omap3-beagle-add-DSS2-support.patch
@@ -1,7 +1,7 @@
-From 48e9baa773af0d99e5f9121da26bb92a391e2853 Mon Sep 17 00:00:00 2001
+From 8a3d9bff79f71a2733607e409f820e79142592d5 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Wed, 10 Feb 2010 15:07:36 +0100
-Subject: [PATCH 05/45] board-omap3-beagle: add DSS2 support
+Subject: [PATCH 05/43] board-omap3-beagle: add DSS2 support
 
 ---
  arch/arm/mach-omap2/board-omap3beagle.c |  130 ++++++++++++++++++++++++-------
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0006-beagleboard-omap3_-foo-_rate_table-omap35x_-foo-_rat.patch b/recipes/linux/linux-omap-psp-2.6.32/0006-beagleboard-omap3_-foo-_rate_table-omap35x_-foo-_rat.patch
deleted file mode 100644
index 4371aad924..0000000000
--- a/recipes/linux/linux-omap-psp-2.6.32/0006-beagleboard-omap3_-foo-_rate_table-omap35x_-foo-_rat.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5be3bc924fbb66f7604763c617eecc4c5b009cb5 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <k-kooi@ti.com>
-Date: Wed, 27 Jan 2010 21:57:13 +0100
-Subject: [PATCH 06/45] beagleboard: omap3_<foo>_rate_table -> omap35x_<foo>_rate_table
-
----
- arch/arm/mach-omap2/board-omap3beagle.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 3b7f6ec..1caaa01 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -502,8 +502,8 @@ static struct platform_device keys_gpio = {
- static void __init omap3_beagle_init_irq(void)
- {
- 	omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
--			     mt46h32m32lf6_sdrc_params, omap3_mpu_rate_table,
--			     omap3_dsp_rate_table, omap3_l3_rate_table);
-+			     mt46h32m32lf6_sdrc_params, omap35x_mpu_rate_table,
-+			     omap35x_dsp_rate_table, omap35x_l3_rate_table);
- 	omap_init_irq();
- #ifdef CONFIG_OMAP_32K_TIMER
- 	omap2_gp_clockevent_set_gptimer(12);
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0007-board-omap3beagle-prepare-for-DM3730-based-Beagleboa.patch b/recipes/linux/linux-omap-psp-2.6.32/0006-board-omap3beagle-prepare-for-DM3730-based-Beagleboa.patch
index 83ada2b602..0a483cd44f 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0007-board-omap3beagle-prepare-for-DM3730-based-Beagleboa.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0006-board-omap3beagle-prepare-for-DM3730-based-Beagleboa.patch
@@ -1,16 +1,17 @@
-From 81f13d0f20e50503eb6baef9bb28a3ed2210154a Mon Sep 17 00:00:00 2001
+From 9f69d9bbab1d24da77864b48dbc5d8d4db9f4cdf Mon Sep 17 00:00:00 2001
 From: Koen Kooi <k-kooi@ti.com>
-Date: Mon, 8 Feb 2010 16:30:59 +0100
-Subject: [PATCH 07/45] board-omap3beagle: prepare for DM3730 based BeagleboardXM
+Date: Wed, 27 Jan 2010 21:57:13 +0100
+Subject: [PATCH 06/43] board-omap3beagle: prepare for DM3730 based BeagleboardXM
 
 * OPP changes copy/pasted from board-omap3evm.c
 	* EHCI changes copy/pasted from Steve Kipisz' 2.6.33rcX work
+	* turn on power to camera on boot and add some comments
 ---
- arch/arm/mach-omap2/board-omap3beagle.c |   57 ++++++++++++++++++++++++++----
- 1 files changed, 49 insertions(+), 8 deletions(-)
+ arch/arm/mach-omap2/board-omap3beagle.c |   62 +++++++++++++++++++++++++++----
+ 1 files changed, 54 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 1caaa01..accf80d 100644
+index 3b7f6ec..429dacb 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -53,6 +53,23 @@
@@ -37,16 +38,21 @@ index 1caaa01..accf80d 100644
  #define GPMC_CS0_BASE  0x60
  #define GPMC_CS_SIZE   0x30
  
-@@ -303,12 +320,23 @@ static int beagle_twl_gpio_setup(struct device *dev,
+@@ -303,12 +320,28 @@ static int beagle_twl_gpio_setup(struct device *dev,
  	 * power switch and overcurrent detect
  	 */
  
 -	gpio_request(gpio + 1, "EHCI_nOC");
 -	gpio_direction_input(gpio + 1);
 +	if (cpu_is_omap3630()) {
++		/* Power on DVI, Serial and PWR led */ 
 + 		gpio_request(gpio + 1, "nDVI_PWR_EN");
 +		gpio_direction_output(gpio + 1, 0);	
 +
++		/* Power on camera interface */
++		gpio_request(gpio + 2, "CAM_EN");
++		gpio_direction_output(gpio + 2, 1);
++
 +		/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
 +		gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
 +		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
@@ -66,13 +72,13 @@ index 1caaa01..accf80d 100644
  
  	/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
  	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
-@@ -501,9 +529,22 @@ static struct platform_device keys_gpio = {
+@@ -501,9 +534,22 @@ static struct platform_device keys_gpio = {
  
  static void __init omap3_beagle_init_irq(void)
  {
 -	omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
--			     mt46h32m32lf6_sdrc_params, omap35x_mpu_rate_table,
--			     omap35x_dsp_rate_table, omap35x_l3_rate_table);
+-			     mt46h32m32lf6_sdrc_params, omap3_mpu_rate_table,
+-			     omap3_dsp_rate_table, omap3_l3_rate_table);
 +        if (cpu_is_omap3630())
 +        {
 +                omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0043-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch b/recipes/linux/linux-omap-psp-2.6.32/0007-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch
index 3788a163b8..184ce18948 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0043-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0007-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch
@@ -1,7 +1,7 @@
-From b6238a79746a5022969a5f780a6e51d794ab9c0c Mon Sep 17 00:00:00 2001
+From 32fb278553a4cd6126c1791d70aa33df12f73d90 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Mon, 3 May 2010 14:41:29 +0200
-Subject: [PATCH 43/45] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot
+Subject: [PATCH 07/43] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot
 
 And add support for zippy2
 ---
@@ -9,7 +9,7 @@ And add support for zippy2
  1 files changed, 78 insertions(+), 10 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 8dfb864..cb2c9c8 100644
+index 429dacb..ac96551 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -75,6 +75,8 @@ static struct omap_opp * _omap37x_l3_rate_table         = NULL;
@@ -106,7 +106,7 @@ index 8dfb864..cb2c9c8 100644
  		.transceiver	= true,
  		.ocr_mask	= 0x00100000,	/* 3.3V */
  	},
-@@ -606,7 +647,7 @@ static void __init omap3beagle_flash_init(void)
+@@ -601,7 +642,7 @@ static void __init omap3beagle_flash_init(void)
  	}
  }
  
@@ -115,7 +115,7 @@ index 8dfb864..cb2c9c8 100644
  
  	.port_mode[0] = EHCI_HCD_OM