linux 3.0: update to 3.0.17

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2026-05-08 04:20:11 +00:00 · 2012-01-13 13:22:29 +01:00
parent 97b5ee17d3
commit 18ff66cb77
204 changed files with 430 additions and 456 deletions
@@ -1,4 +1,4 @@
-From 59159a323bad225e6c68850622e46e24ea28a271 Mon Sep 17 00:00:00 2001
+From ba3e97075ad35eeaf35191c4e5c2b90de5d96209 Mon Sep 17 00:00:00 2001
 From: Fernandes, Joel A <joelagnel@ti.com>
 Date: Tue, 7 Jun 2011 15:54:45 -0500
 Subject: [PATCH 01/10] OMAP3: beagle: add support for beagleboard xM revision C
@@ -192,5 +192,5 @@ index 34f8411..32f5f89 100644
 			ARRAY_SIZE(omap3_beagle_devices));
 	omap_display_init(&beagle_dss_data);
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 073595739bd14678bf91bdaf932c7107b6f2327a Mon Sep 17 00:00:00 2001
+From 73366785ad8400aa22ffc0822ecc701349477de9 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Thu, 21 Jul 2011 14:29:42 +0200
 Subject: [PATCH 02/10] UNFINISHED: OMAP3: beagle: add support for expansionboards
@@ -336,5 +336,5 @@ index 32f5f89..f26a9a8 100644
 	/* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */
 	.boot_params	= 0x80000100,
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 59d55e3d37c9fe6f85ed4070666ecd2e7f3d1b2e Mon Sep 17 00:00:00 2001
+From a7e1724833070f01b82381f40b084fd33e46836d Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Thu, 21 Jul 2011 12:59:20 +0200
 Subject: [PATCH 03/10] HACK: OMAP3: beagle: switch to GPTIMER1
@@ -22,5 +22,5 @@ index f26a9a8..a04f5a0 100644
 +	.timer		= &omap3_timer,
 MACHINE_END
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From f0b5e5f22a295318030f92dc6103118fde35cf6d Mon Sep 17 00:00:00 2001
+From 6ebc5081aba3428762e4e055a154fdda9ebe442e Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Wed, 25 May 2011 08:57:40 +0200
 Subject: [PATCH 04/10] OMAP3: beagle: HACK! add in 1GHz OPP
@@ -27,5 +27,5 @@ index a04f5a0..5e1d9f9 100644
 		if (r) {
 			pr_err("%s: failed to enable higher opp %d\n",
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 9e22c7b5124240e43d840312687c7204436c3010 Mon Sep 17 00:00:00 2001
+From f0a23fe6d3c8fc9bbb60a962114b64b923ca4515 Mon Sep 17 00:00:00 2001
 From: Sanjeev Premi <premi@ti.com>
 Date: Tue, 18 Jan 2011 13:19:55 +0530
 Subject: [PATCH 05/10] omap3: Add basic support for 720MHz part
@@ -72,7 +72,7 @@ index 2537090..b6ed78a 100644
 	printk(")\n");
 }
 diff --git a/arch/arm/mach-omap2/opp3xxx_data.c b/arch/arm/mach-omap2/opp3xxx_data.c
-index 12fc2da..6906992 100644
+index d95f3f9..44fbc84 100644
 --- a/arch/arm/mach-omap2/opp3xxx_data.c
 +++ b/arch/arm/mach-omap2/opp3xxx_data.c
@@ -18,8 +18,10 @@
@@ -86,7 +86,7 @@ index 12fc2da..6906992 100644
 
 #include "control.h"
 #include "omap_opp_data.h"
-@@ -99,6 +101,8 @@ static struct omap_opp_def __initdata omap34xx_opp_def_list[] = {
+@@ -98,6 +100,8 @@ static struct omap_opp_def __initdata omap34xx_opp_def_list[] = {
 	OPP_INITIALIZER("mpu", true, 550000000, OMAP3430_VDD_MPU_OPP4_UV),
 	/* MPU OPP5 */
 	OPP_INITIALIZER("mpu", true, 600000000, OMAP3430_VDD_MPU_OPP5_UV),
@@ -95,7 +95,7 @@ index 12fc2da..6906992 100644
 
 	/*
 	 * L3 OPP1 - 41.5 MHz is disabled because: The voltage for that OPP is
-@@ -124,6 +128,8 @@ static struct omap_opp_def __initdata omap34xx_opp_def_list[] = {
+@@ -123,6 +127,8 @@ static struct omap_opp_def __initdata omap34xx_opp_def_list[] = {
 	OPP_INITIALIZER("iva", true, 400000000, OMAP3430_VDD_MPU_OPP4_UV),
 	/* DSP OPP5 */
 	OPP_INITIALIZER("iva", true, 430000000, OMAP3430_VDD_MPU_OPP5_UV),
@@ -104,7 +104,7 @@ index 12fc2da..6906992 100644
 };
 
 static struct omap_opp_def __initdata omap36xx_opp_def_list[] = {
-@@ -151,6 +157,57 @@ static struct omap_opp_def __initdata omap36xx_opp_def_list[] = {
+@@ -150,6 +156,57 @@ static struct omap_opp_def __initdata omap36xx_opp_def_list[] = {
 	OPP_INITIALIZER("iva", false, 800000000, OMAP3630_VDD_MPU_OPP1G_UV),
 };
 
@@ -162,7 +162,7 @@ index 12fc2da..6906992 100644
 /**
  * omap3_opp_init() - initialize omap3 opp table
  */
-@@ -164,10 +221,14 @@ int __init omap3_opp_init(void)
+@@ -163,10 +220,14 @@ int __init omap3_opp_init(void)
 	if (cpu_is_omap3630())
 		r = omap_init_opp_table(omap36xx_opp_def_list,
 			ARRAY_SIZE(omap36xx_opp_def_list));
@@ -198,5 +198,5 @@ index 8198bb6..5204c1e 100644
 
 #endif
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From f6b0d03d59c13ea30c17aa68d07c06a5229aee1f Mon Sep 17 00:00:00 2001
+From d9242a243b61059cacde8ce1241b84fc787c57d1 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Thu, 20 Oct 2011 11:14:08 +0200
 Subject: [PATCH 06/10] ARM: OMAP2+: beagleboard: make wilink init look more like pandaboard
@@ -28,5 +28,5 @@ index 5e1d9f9..13fffb0 100644
 	.num_consumer_supplies = 1,
 	.consumer_supplies = &beagle_vmmc2_supply,
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From ae51bba851acde11012d3ba4204b99e1c49b446d Mon Sep 17 00:00:00 2001
+From 47be8c9046c22715ce646091dd9e98fa87fc86e1 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Mon, 18 Jul 2011 23:13:41 -0500
 Subject: [PATCH 07/10] omap_hsmmc: Set dto to max value of 14 to avoid SD Card timeouts
@@ -29,5 +29,5 @@ index dedf3da..a8a60d4 100644
 	reg |= dto << DTO_SHIFT;
 	OMAP_HSMMC_WRITE(host->base, SYSCTL, reg);
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 93b4f0bb46f9b9075bf830f2597816c3adeb01b7 Mon Sep 17 00:00:00 2001
+From 2a9282daf94e8b9a1c8dc6fdf5b97461eb15348d Mon Sep 17 00:00:00 2001
 From: Andy Green <andy@warmcat.com>
 Date: Thu, 24 Mar 2011 21:27:29 +0000
 Subject: [PATCH 08/10] OMAP2+: add cpu id register to MAC address helper
@@ -85,5 +85,5 @@ index 02ed3aa..373313a 100644
 
 #endif
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From cd24ee61ea78fad5c592f9b1fe58bc4415fd4c5c Mon Sep 17 00:00:00 2001
+From d0212d089b62cd7ebcd53104717180482e35ec1a Mon Sep 17 00:00:00 2001
 From: Jason Kridner <jdk@ti.com>
 Date: Thu, 15 Sep 2011 18:23:02 -0400
 Subject: [PATCH 09/10] HACK: OMAP2+: BeagleBoard: Fix up random or missing MAC addresses for eth0 and wlan0
@@ -152,5 +152,5 @@ index 13fffb0..5ffe185 100644
 }
 
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From e19ae187c1055a03781daca6964050aa238e1e78 Mon Sep 17 00:00:00 2001
+From 713c5b4ce910dacdd75e9616b0f989d643008536 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Wed, 19 Oct 2011 12:44:14 +0200
 Subject: [PATCH 10/10] ARM: OMAP2+: beagleboard: fix mmc write protect pin when using the wilink expansion board
@@ -22,5 +22,5 @@ index 5ffe185..0124060 100644
 	{
 		.name		= "wl1271",
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,26 +0,0 @@
-From 6d7bf5251219d2aa604ada2c955812b16ad5cff4 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 30 Nov 2011 09:50:56 +0100
-Subject: [PATCH] Revert "mfd: Fix twl4030 dependencies for audio codec"
-
-This reverts commit 11b8fc6ae54bf18a48c94e181c37ca135b858b42.
---
- drivers/mfd/twl-core.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
-index f0dfca3..e659d4e 100644
--- a/drivers/mfd/twl-core.c
-+++ b/drivers/mfd/twl-core.c
-@@ -116,7 +116,7 @@
- #define twl_has_watchdog()        false
- #endif
- 
-#if defined(CONFIG_MFD_TWL4030_AUDIO) || defined(CONFIG_MFD_TWL4030_AUDIO_MODULE) ||\
-+#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
- 	defined(CONFIG_SND_SOC_TWL6040) || defined(CONFIG_SND_SOC_TWL6040_MODULE)
- #define twl_has_codec()	true
- #else
-- 
-1.7.2.5
-
@@ -1,4 +1,4 @@
-From 922c70f408f5b6631272b373c4724d2065cc9414 Mon Sep 17 00:00:00 2001
+From 174f636d95d1f6aa6fc6ba3e81282fb49b0feecd Mon Sep 17 00:00:00 2001
 From: Keerthy <j-keerthy@ti.com>
 Date: Wed, 4 May 2011 01:14:50 +0530
 Subject: [PATCH 1/2] Enabling Hwmon driver for twl4030-madc
@@ -9,7 +9,7 @@ Signed-off-by: Keerthy <j-keerthy@ti.com>
 1 files changed, 15 insertions(+), 0 deletions(-)

 diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
-index b8f2a4e..463ee67 100644
+index f82413a..e39dbed 100644
 --- a/drivers/mfd/twl-core.c
 +++ b/drivers/mfd/twl-core.c
@@ -83,6 +83,13 @@
@@ -42,5 +42,5 @@ index b8f2a4e..463ee67 100644
 		/*
 		 * REVISIT platform_data here currently might expose the
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 24b1b0c669d953c277ce267fb4fd78117ffbfa65 Mon Sep 17 00:00:00 2001
+From f4aed769e9e59998f44447e7309e192573e6fac6 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Sat, 23 Jan 2010 06:26:54 -0800
 Subject: [PATCH 2/2] mfd: twl-core: enable madc clock
@@ -12,7 +12,7 @@ Signed-off-by: Steve Sakoman <steve@sakoman.com>
 2 files changed, 9 insertions(+), 0 deletions(-)

 diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
-index 463ee67..e659d4e 100644
+index e39dbed..018ee53 100644
 --- a/drivers/mfd/twl-core.c
 +++ b/drivers/mfd/twl-core.c
@@ -217,6 +217,11 @@
@@ -50,5 +50,5 @@ index ba4f886..6802efc 100644
 #define TWL_MODULE_MADC		TWL4030_MODULE_MADC
 #define TWL_MODULE_MAIN_CHARGE	TWL4030_MODULE_MAIN_CHARGE
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 6b804de06fd4735097ad12ea1d26f8a31eaa4f93 Mon Sep 17 00:00:00 2001
+From 44ab86140417f173835e19bed62d6832023f2914 Mon Sep 17 00:00:00 2001
 From: Peter Ujfalusi <peter.ujfalusi@ti.com>
 Date: Wed, 17 Aug 2011 16:02:55 +0200
 Subject: [PATCH] OMAP: Fix linking error in twl-common.c for OMAP2/3/4 only builds
@@ -125,5 +125,5 @@ index 3aaa46f..58409c0 100644
 -}
 +#endif /* CONFIG_ARCH_OMAP4 */
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,10 +1,10 @@
 #!/bin/bash
-# (c) 2009 - 2011 Koen Kooi <koen@dominion.thruhere.net>
+# (c) 2009 - 2012 Koen Kooi <koen@dominion.thruhere.net>
 # This script will take a set of directories with patches and make a git tree out of it
 # After all the patches are applied it will output a SRC_URI fragment you can copy/paste into a recipe
 set -e

-TAG="v3.0.4"
+TAG="v3.0.17"
 EXTRATAG=""
 PATCHPATH=$(dirname $0)

@@ -13,7 +13,7 @@ git reset --hard ${TAG}
 rm export -rf

 previous=${TAG}
-PATCHSET="pm-wip/voltdm pm-wip/cpufreq bias beagle madc sakoman sgx ulcd omap4"
+PATCHSET="pm-wip/voltdm pm-wip/cpufreq beagle madc sakoman sgx ulcd omap4"

 # apply patches
 for patchset in ${PATCHSET} ; do
@@ -1,4 +1,4 @@
-From 90787bd0d3828d29cf41137d61409afcbb7e3cef Mon Sep 17 00:00:00 2001
+From 3dfeff8f9ad8fa7e6e434eb4b450a11ab79131da Mon Sep 17 00:00:00 2001
 From: Nishanth Menon <nm@ti.com>
 Date: Wed, 25 May 2011 00:43:26 -0700
 Subject: [PATCH 01/19] PM: OPP: introduce function to free cpufreq table
@@ -16,7 +16,7 @@ Acked-by: Kevin Hilman <khilman@ti.com>
 3 files changed, 27 insertions(+), 0 deletions(-)

 diff --git a/Documentation/power/opp.txt b/Documentation/power/opp.txt
-index 5ae70a1..3035d00 100644
+index 5ae70a12..3035d00 100644
 --- a/Documentation/power/opp.txt
 +++ b/Documentation/power/opp.txt
@@ -321,6 +321,8 @@ opp_init_cpufreq_table - cpufreq framework typically is initialized with
@@ -80,5 +80,5 @@ index 5449945..7020e97 100644
 
 #endif		/* __LINUX_OPP_H__ */
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 766c6bfe93456e5237395eff166e84f75612f0b2 Mon Sep 17 00:00:00 2001
+From bc2810462308f15ff90841453961200bf90a814d Mon Sep 17 00:00:00 2001
 From: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
 Date: Wed, 11 Aug 2010 17:02:43 -0700
 Subject: [PATCH 02/19] OMAP: CPUfreq: ensure driver initializes after cpufreq framework and governors
@@ -24,5 +24,5 @@ index da4f68d..cd09d4b 100644
 /*
  * if ever we want to remove this, upon cleanup call:
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 2a0e7b1eebafe251fc38a1d9a4439251f7ffd89b Mon Sep 17 00:00:00 2001
+From be4be1a11360222f0b0add1dadfeaf76af199990 Mon Sep 17 00:00:00 2001
 From: Kevin Hilman <khilman@deeprootsystems.com>
 Date: Wed, 11 Aug 2010 17:05:38 -0700
 Subject: [PATCH 03/19] OMAP: CPUfreq: ensure policy is fully initialized
@@ -28,5 +28,5 @@ index cd09d4b..1b36664 100644
 	policy->cpuinfo.transition_latency = 300 * 1000;
 
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From a96276d576546ce98d7e3ea101d1138d7063d10b Mon Sep 17 00:00:00 2001
+From fcd436dfb1c2d8e4866001700a5bba2a1d4079aa Mon Sep 17 00:00:00 2001
 From: Rajendra Nayak <rnayak@ti.com>
 Date: Mon, 10 Nov 2008 17:00:25 +0530
 Subject: [PATCH 04/19] OMAP3 PM: CPUFreq driver for OMAP3
@@ -260,5 +260,5 @@ index 1b36664..f0f9430 100644
 		result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
 		if (!result)
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From a7a51ef3357330dc8ca7056a0ac4db1a2359fc95 Mon Sep 17 00:00:00 2001
+From 62275cbaac608a17fe5ff0437e0950667927e5e8 Mon Sep 17 00:00:00 2001
 From: Silesh C V <silesh@ti.com>
 Date: Wed, 29 Sep 2010 14:52:54 +0530
 Subject: [PATCH 05/19] OMAP: PM: CPUFREQ: Fix conditional compilation
@@ -29,5 +29,5 @@ index f0f9430..c3ac065 100644
 #else
 #define MPU_CLK		"virt_prcm_set"
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From d99427d8abe9927a12ac08eaeaf213b46f12fe75 Mon Sep 17 00:00:00 2001
+From ca2d4d46267668daccc156084f8ad6e74a52f392 Mon Sep 17 00:00:00 2001
 From: Kevin Hilman <khilman@deeprootsystems.com>
 Date: Tue, 16 Nov 2010 11:48:41 -0800
 Subject: [PATCH 06/19] cpufreq: fixup after new OPP layer merged
@@ -30,5 +30,5 @@ index c3ac065..9cd2709 100644
 
 #define VERY_HI_RATE	900000000
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 4cdc600bf4f16e87ebe0c3934ecfd588d3fdb6f0 Mon Sep 17 00:00:00 2001
+From 972aa97a8a36946ebe2274e27c317e524de2cd5c Mon Sep 17 00:00:00 2001
 From: Santosh Shilimkar <santosh.shilimkar@ti.com>
 Date: Mon, 14 Mar 2011 17:08:48 +0530
 Subject: [PATCH 07/19] OMAP: cpufreq: Split OMAP1 and OMAP2PLUS CPUfreq drivers.
@@ -669,5 +669,5 @@ index 9cd2709..0000000
 - */
 -
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From bf0972efdb9557cec20b531fc0543b376eae009d Mon Sep 17 00:00:00 2001
+From fed2c5a3d929204d4fc18c6f4a3edbf920e7ee36 Mon Sep 17 00:00:00 2001
 From: Santosh Shilimkar <santosh.shilimkar@ti.com>
 Date: Mon, 14 Mar 2011 17:08:49 +0530
 Subject: [PATCH 08/19] OMAP2PLUS: cpufreq: Add SMP support to cater OMAP4430
@@ -167,5 +167,5 @@ index 27f641b..3730f96 100644
 	/* FIXME: what's the actual transition time? */
 	policy->cpuinfo.transition_latency = 300 * 1000;
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 0c43215efb0be9c948c70f6562f9a853f35dcb36 Mon Sep 17 00:00:00 2001
+From d046bd12930aa5daf951d9af8614c60677c8ff15 Mon Sep 17 00:00:00 2001
 From: Jarkko Nikula <jhnikula@gmail.com>
 Date: Thu, 14 Apr 2011 16:21:58 +0300
 Subject: [PATCH 09/19] OMAP2PLUS: cpufreq: Fix typo when attempting to set mpu_clk for OMAP4
@@ -26,5 +26,5 @@ index 3730f96..a725d90 100644
 
 	if (IS_ERR(mpu_clk))
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 3926882436e81397cbc6c69a4f0c6beaaa62d53c Mon Sep 17 00:00:00 2001
+From 0ec2aee24f701ecd6135dce0b3f1a71249583689 Mon Sep 17 00:00:00 2001
 From: Nishanth Menon <nm@ti.com>
 Date: Wed, 25 May 2011 16:38:46 -0700
 Subject: [PATCH 10/19] OMAP2+: cpufreq: move clk name decision to init
@@ -60,5 +60,5 @@ index a725d90..c46d0cd 100644
 }
 
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 5f3569f6e0a4c9b6c1fdfd41873996a73fc5d0c7 Mon Sep 17 00:00:00 2001
+From 7c76e002041cd5b084c9a8b6729ab33acf53643e Mon Sep 17 00:00:00 2001
 From: Nishanth Menon <nm@ti.com>
 Date: Wed, 25 May 2011 16:38:47 -0700
 Subject: [PATCH 11/19] OMAP2+: cpufreq: deny initialization if no mpudev
@@ -60,5 +60,5 @@ index c46d0cd..33a91ec 100644
 }
 
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From d93aed317814662ab3fc9250447c363b3fa01c9e Mon Sep 17 00:00:00 2001
+From 407f4d9ed824d458406f139a7698c74a1eb3b8f7 Mon Sep 17 00:00:00 2001
 From: Nishanth Menon <nm@ti.com>
 Date: Thu, 26 May 2011 19:39:17 -0700
 Subject: [PATCH 12/19] OMAP2+: cpufreq: dont support !freq_table
@@ -125,5 +125,5 @@ index 33a91ec..acf18e8 100644
 	policy->max = policy->cpuinfo.max_freq;
 	policy->cur = omap_getspeed(policy->cpu);
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From a137d81553d7fa6db2b985d8fb024215d97f3b54 Mon Sep 17 00:00:00 2001
+From 525df87add27c07a76e06c45f0756b204a5a3880 Mon Sep 17 00:00:00 2001
 From: Nishanth Menon <nm@ti.com>
 Date: Thu, 26 May 2011 19:39:18 -0700
 Subject: [PATCH 13/19] OMAP2+: cpufreq: only supports OPP library
@@ -42,5 +42,5 @@ index acf18e8..3af7cda 100644
 	return 0;
 }
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From aa422c49cd4b49cb3b49aca3bf2e114f3e986199 Mon Sep 17 00:00:00 2001
+From b0f40f6545e9ae32b6cbd2cb03561de805297bf5 Mon Sep 17 00:00:00 2001
 From: Nishanth Menon <nm@ti.com>
 Date: Thu, 26 May 2011 19:39:19 -0700
 Subject: [PATCH 14/19] OMAP2+: cpufreq: put clk if cpu_init failed
@@ -57,5 +57,5 @@ index 3af7cda..e019297 100644
 
 static int omap_cpu_exit(struct cpufreq_policy *policy)
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 3e45cd20962667f2afbd9fefccb91494ecc4ab5f Mon Sep 17 00:00:00 2001
+From 67324a92ca4778fb6be86058c91ac7c9442ede16 Mon Sep 17 00:00:00 2001
 From: Nishanth Menon <nm@ti.com>
 Date: Thu, 26 May 2011 19:39:20 -0700
 Subject: [PATCH 15/19] OMAP2+: cpufreq: fix freq_table leak
@@ -86,5 +86,5 @@ index e019297..a962a31 100644
 	return 0;
 }
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 5dfc6be0282ea9f99f9f38c1425704af4401b0ab Mon Sep 17 00:00:00 2001
+From f0e647da78b80946ab301787aba4330bd7d1429d Mon Sep 17 00:00:00 2001
 From: Santosh Shilimkar <santosh.shilimkar@ti.com>
 Date: Fri, 3 Jun 2011 17:46:57 +0530
 Subject: [PATCH 16/19] OMAP2+: CPUfreq: Remove superfluous check in target() for online CPU's.
@@ -54,5 +54,5 @@ index a962a31..eaefa49 100644
 		dev_err(mpu_dev, "%s: cpu%d: no freq table!\n", __func__,
 				policy->cpu);
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 2dd7fe3249bc8cbabc1faa46b7a858e401cafd5a Mon Sep 17 00:00:00 2001
+From 669ad0bf5d48d8675365a212f561f57bec4d9158 Mon Sep 17 00:00:00 2001
 From: Colin Cross <ccross@google.com>
 Date: Mon, 6 Jun 2011 21:05:29 -0500
 Subject: [PATCH 17/19] OMAP2+: cpufreq: notify even with bad boot frequency
@@ -44,5 +44,5 @@ index eaefa49..8598928 100644
 
 	if (!is_smp()) {
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 5ead83b7ca5be46c05bf6c13e1b9384161ae3f2a Mon Sep 17 00:00:00 2001
+From 0d8c6a265f29587ab9c6df1c6bebe359a8d71d09 Mon Sep 17 00:00:00 2001
 From: Todd Poynor <toddpoynor@google.com>
 Date: Tue, 7 Jun 2011 13:57:52 -0700
 Subject: [PATCH 18/19] OMAP2+: cpufreq: Enable all CPUs in shared policy mask
@@ -38,5 +38,5 @@ index 8598928..1f3b2e1 100644
 
 	/* FIXME: what's the actual transition time? */
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 9b352c30c2ddb0dec7f6597148f22ae5bbc27877 Mon Sep 17 00:00:00 2001
+From 550f74e2915393426e15c8d12695707253c8a91d Mon Sep 17 00:00:00 2001
 From: Russell King <rmk+kernel@arm.linux.org.uk>
 Date: Mon, 11 Jul 2011 23:10:04 +0530
 Subject: [PATCH 19/19] OMAP2+: CPUfreq: update lpj with reference value to avoid progressive error.
@@ -117,5 +117,5 @@ index 1f3b2e1..de82e87 100644
 }
 
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From e61a662c4d02b9af19bd95d01e18499ef0296424 Mon Sep 17 00:00:00 2001
+From d95bccb7d0ad132153543bcc018e8da8aba1832d Mon Sep 17 00:00:00 2001
 From: Oleg Drokin <green@linuxhacker.ru>
 Date: Mon, 6 Jun 2011 18:57:07 +0000
 Subject: [PATCH 001/149] cleanup regulator supply definitions in mach-omap2
@@ -368,7 +368,7 @@ index 7f21d24..4cf7c19 100644
 
 /* VPLL2 for digital video outputs */
 diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
-index b4d4346..fc7a23a 100644
+index b4d43464..fc7a23a 100644
 --- a/arch/arm/mach-omap2/board-omap3evm.c
 +++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -273,12 +273,12 @@ static struct omap_dss_board_info omap3_evm_dss_data = {
@@ -909,7 +909,7 @@ index 175e1ab..30c7556 100644
 
 /* VPLL2 for digital video outputs */
 diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
-index 88bd6f7..7810b1e 100644
+index c565971..b633ba8 100644
 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
 +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -358,14 +358,17 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
@@ -1079,5 +1079,5 @@ index 118c6f5..cb012e1 100644
 
 static int zoom_twl_gpio_setup(struct device *dev,
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From dc6bfdf43ee0929cc9de539a29ee3e6baf4946c3 Mon Sep 17 00:00:00 2001
+From a3d13ae14bca7c412e5b0575c244ce7370fa3747 Mon Sep 17 00:00:00 2001
 From: Oleg Drokin <green@linuxhacker.ru>
 Date: Mon, 6 Jun 2011 18:57:08 +0000
 Subject: [PATCH 002/149] Remove old-style supply.dev assignments common in hsmmc init
@@ -156,5 +156,5 @@ index cb012e1..8495f82 100644
 			       "lcd enable");
 	if (ret)
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 99f7f1dfd415d626cb2443b271aefb4c145ca9d0 Mon Sep 17 00:00:00 2001
+From 5edd966fdcf04f3166c1b7028215e502ba7d5275 Mon Sep 17 00:00:00 2001
 From: Tony Lindgren <tony@atomide.com>
 Date: Tue, 17 May 2011 03:51:26 -0700
 Subject: [PATCH 003/149] omap: Use separate init_irq functions to avoid cpu_is_omap tests early
@@ -566,7 +566,7 @@ index c80e2c3..ae97910 100644
 	omap2_gp_clockevent_set_gptimer(12);
 #endif
 diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
-index 031a9a6..e3928f2 100644
+index 031a9a6..e3928f23 100644
 --- a/arch/arm/mach-omap2/board-overo.c
 +++ b/arch/arm/mach-omap2/board-overo.c
@@ -615,7 +615,7 @@ MACHINE_START(OVERO, "Gumstix Overo")
@@ -798,5 +798,5 @@ index 5a25098..c884320 100644
 void omap_intc_save_context(void);
 void omap_intc_restore_context(void);
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From b10de9a3ea356e2e0994f9b248f140f3807a6cd4 Mon Sep 17 00:00:00 2001
+From b623b767d19edcc2d08909b044e1ab57956d9d49 Mon Sep 17 00:00:00 2001
 From: Tony Lindgren <tony@atomide.com>
 Date: Tue, 29 Mar 2011 15:54:48 -0700
 Subject: [PATCH 004/149] omap: Set separate timer init functions to avoid cpu_is_omap tests
@@ -224,7 +224,7 @@ index 24f0f7b..9c3b7c5 100644
 +	.timer		= &omap1_timer,
 MACHINE_END
 diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
-index 98826e2..036edc0 100644
+index 98826e2..036edc0e 100644
 --- a/arch/arm/mach-omap1/board-voiceblue.c
 +++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -306,5 +306,5 @@ MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
@@ -535,7 +535,7 @@ index 6d2372b..dc1d6dc 100644
 +	.timer		= &omap4_timer,
 MACHINE_END
 diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
-index e3928f2..1bf2f39 100644
+index e3928f23..1bf2f39 100644
 --- a/arch/arm/mach-omap2/board-overo.c
 +++ b/arch/arm/mach-omap2/board-overo.c
@@ -617,5 +617,5 @@ MACHINE_START(OVERO, "Gumstix Overo")
@@ -685,5 +685,5 @@ index d6c70d2..330bd17 100644
 
 int omap_dm_timer_init(void);
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From c89952d1bd277bd94c21a000ebae3d4b22fa198d Mon Sep 17 00:00:00 2001
+From 99573b33f37eede2d3d36ae71c34f5d72ccdc672 Mon Sep 17 00:00:00 2001
 From: Tony Lindgren <tony@atomide.com>
 Date: Tue, 29 Mar 2011 15:54:48 -0700
 Subject: [PATCH 005/149] omap: Move dmtimer defines to dmtimer.h
@@ -283,5 +283,5 @@ index 330bd17..3203105 100644
 
 #endif /* __ASM_ARCH_DMTIMER_H */
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From b18bc7b18ebb99e06ae5052eccf722a2dad4aaec Mon Sep 17 00:00:00 2001
+From 902f3165afa284d4bd6ff22db7654318c98a5ce0 Mon Sep 17 00:00:00 2001
 From: Tony Lindgren <tony@atomide.com>
 Date: Tue, 29 Mar 2011 15:54:48 -0700
 Subject: [PATCH 006/149] omap: Make a subset of dmtimer functions into inline functions
@@ -319,5 +319,5 @@ index 3203105..54664a7 100644
 +
 #endif /* __ASM_ARCH_DMTIMER_H */
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From c47fb2256d8e994ca75b6205cdd7f7329b5bd765 Mon Sep 17 00:00:00 2001
+From 8f322fa141e55da412c5d73f07f93c1e02965522 Mon Sep 17 00:00:00 2001
 From: Tony Lindgren <tony@atomide.com>
 Date: Tue, 29 Mar 2011 15:54:48 -0700
 Subject: [PATCH 007/149] omap2+: Use dmtimer macros for clockevent
@@ -275,5 +275,5 @@ index 54664a7..dd8b3ff 100644
 	unsigned enabled:1;
 	unsigned posted:1;
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 5ba31c178c6b03776fbc9fa336d01dbd09e174fc Mon Sep 17 00:00:00 2001
+From 6e1cacccf1349d97c83c7bc93e4d3c15e731c3ad Mon Sep 17 00:00:00 2001
 From: Tony Lindgren <tony@atomide.com>
 Date: Tue, 29 Mar 2011 15:54:49 -0700
 Subject: [PATCH 008/149] omap2+: Remove gptimer_wakeup for now
@@ -173,5 +173,5 @@ index dd8b3ff..8adcb18 100644
 
 int omap_dm_timer_init(void);
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 35723ec9195458a0739f26260fe33c2a88811404 Mon Sep 17 00:00:00 2001
+From b3d437835cf2885fe7a8c6470ca7639e5c11850a Mon Sep 17 00:00:00 2001
 From: Nishanth Menon <nm@ti.com>
 Date: Mon, 14 Feb 2011 12:16:36 +0530
 Subject: [PATCH 009/149] OMAP3+: SR: make notify independent of class
@@ -19,7 +19,7 @@ Signed-off-by: Kevin Hilman <khilman@ti.com>
 1 files changed, 2 insertions(+), 4 deletions(-)

 diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
-index fb7dc52..3ee7261 100644
+index f5a6bc1..785ed4c 100644
 --- a/arch/arm/mach-omap2/smartreflex.c
 +++ b/arch/arm/mach-omap2/smartreflex.c
@@ -143,7 +143,7 @@ static irqreturn_t sr_interrupt(int irq, void *data)
@@ -43,5 +43,5 @@ index fb7dc52..3ee7261 100644
 		if (name == NULL) {
 			ret = -ENOMEM;
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 02dcfbd013eb0b127ba9f2b5002caf7d0099602c Mon Sep 17 00:00:00 2001
+From 252ef25d54768a725289253c494e1f37a5eec526 Mon Sep 17 00:00:00 2001
 From: Nishanth Menon <nm@ti.com>
 Date: Mon, 14 Feb 2011 12:41:10 +0530
 Subject: [PATCH 010/149] OMAP3+: SR: disable interrupt by default
@@ -20,7 +20,7 @@ Signed-off-by: Kevin Hilman <khilman@ti.com>
 1 files changed, 1 insertions(+), 0 deletions(-)

 diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
-index 3ee7261..616ef62 100644
+index 785ed4c..6b69ada 100644
 --- a/arch/arm/mach-omap2/smartreflex.c
 +++ b/arch/arm/mach-omap2/smartreflex.c
@@ -268,6 +268,7 @@ static int sr_late_init(struct omap_sr *sr_info)
@@ -32,5 +32,5 @@ index 3ee7261..616ef62 100644
 
 	if (pdata && pdata->enable_on_init)
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From f77889fb5747c6fd6e4f1431641d603565adfc2d Mon Sep 17 00:00:00 2001
+From e060d73eef027063f687feae1c3d0ad2418a88aa Mon Sep 17 00:00:00 2001
 From: Nishanth Menon <nm@ti.com>
 Date: Mon, 14 Feb 2011 21:14:17 +0530
 Subject: [PATCH 011/149] OMAP3+: SR: enable/disable SR only on need
@@ -14,7 +14,7 @@ Signed-off-by: Kevin Hilman <khilman@ti.com>
 1 files changed, 7 insertions(+), 4 deletions(-)

 diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
-index 616ef62..3bd9fac 100644
+index 6b69ada..1a370b9 100644
 --- a/arch/arm/mach-omap2/smartreflex.c
 +++ b/arch/arm/mach-omap2/smartreflex.c
@@ -807,10 +807,13 @@ static int omap_sr_autocomp_store(void *data, u64 val)
@@ -36,5 +36,5 @@ index 616ef62..3bd9fac 100644
 	return 0;
 }
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 98f0d59201499ec52907464492480bc9d60915b3 Mon Sep 17 00:00:00 2001
+From d9d17d6ea5a56b81a7d6d134aeeeff6a3b9fbf88 Mon Sep 17 00:00:00 2001
 From: Nishanth Menon <nm@ti.com>
 Date: Mon, 14 Feb 2011 12:33:13 +0530
 Subject: [PATCH 012/149] OMAP3+: SR: fix cosmetic indentation
@@ -13,7 +13,7 @@ Signed-off-by: Kevin Hilman <khilman@ti.com>
 1 files changed, 10 insertions(+), 10 deletions(-)

 diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
-index 3bd9fac..2ce2fb7 100644
+index 1a370b9..be6add0 100644
 --- a/arch/arm/mach-omap2/smartreflex.c
 +++ b/arch/arm/mach-omap2/smartreflex.c
@@ -277,16 +277,16 @@ static int sr_late_init(struct omap_sr *sr_info)
@@ -44,5 +44,5 @@ index 3bd9fac..2ce2fb7 100644
 
 static void sr_v1_disable(struct omap_sr *sr)
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 89d586a1085b33467443e464e50d209b4658bc20 Mon Sep 17 00:00:00 2001
+From 8009544b2ea8ceba920455bb7e5e267cc78d3827 Mon Sep 17 00:00:00 2001
 From: Tony Lindgren <tony@atomide.com>
 Date: Tue, 29 Mar 2011 15:54:49 -0700
 Subject: [PATCH 013/149] omap2+: Reserve clocksource and timesource and initialize dmtimer later
@@ -121,5 +121,5 @@ index 8adcb18..d0f3a2d 100644
 
 static inline u32 __omap_dm_timer_read(void __iomem *base, u32 reg,
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 6820ff92aecd799fb3b4e3438d887fcd3873a8f3 Mon Sep 17 00:00:00 2001
+From 595da70cb0e039cbe04d9c7ce179883e6f8878c1 Mon Sep 17 00:00:00 2001
 From: Tony Lindgren <tony@atomide.com>
 Date: Tue, 29 Mar 2011 15:54:49 -0700
 Subject: [PATCH 014/149] omap2+: Use dmtimer macros for clocksource
@@ -159,5 +159,5 @@ index f7fed60..c13bc3d 100644
 {
 	return _omap_32k_sched_clock();
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From bb7b0da5577dc660cd953a0c664f544f2811917f Mon Sep 17 00:00:00 2001
+From e50befd53e52f2c72a26e33812ad896d5f8524fa Mon Sep 17 00:00:00 2001
 From: Tony Lindgren <tony@atomide.com>
 Date: Tue, 29 Mar 2011 15:54:49 -0700
 Subject: [PATCH 015/149] omap2+: Remove omap2_gp_clockevent_set_gptimer
@@ -236,5 +236,5 @@ index 5c1072c..0000000
 -
 -#endif
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From b8c15127d23707eb139d120faa1d30ab96da997e Mon Sep 17 00:00:00 2001
+From 5cdb1497ccc5b9dae8795e1e5e9c74f11e4e7401 Mon Sep 17 00:00:00 2001
 From: Tony Lindgren <tony@atomide.com>
 Date: Tue, 29 Mar 2011 15:54:50 -0700
 Subject: [PATCH 016/149] omap2+: Rename timer-gp.c into timer.c to combine timer init functions
@@ -733,5 +733,5 @@ index 0000000..e964072
 +OMAP_SYS_TIMER(4)
 +#endif
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From d40bbc6043b6c56b956606b308a10cb0d7a18cbf Mon Sep 17 00:00:00 2001
+From a72eaf768c2f553f72e7afc0b1c52661b2913022 Mon Sep 17 00:00:00 2001
 From: Grazvydas Ignotas <notasas@gmail.com>
 Date: Fri, 3 Jun 2011 19:56:33 +0000
 Subject: [PATCH 017/149] omap: cleanup NAND platform data
@@ -161,5 +161,5 @@ index d86d1ec..67fc506 100644
 	enum nand_io		xfer_type;
 	unsigned long		phys_base;
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 62133074bed241778c6c13e9800550036b7b19b1 Mon Sep 17 00:00:00 2001
+From 3e0e5636effabe150374f2a212974f1e954be5b2 Mon Sep 17 00:00:00 2001
 From: Peter Ujfalusi <peter.ujfalusi@ti.com>
 Date: Tue, 28 Jun 2011 10:16:55 +0000
 Subject: [PATCH 018/149] omap: board-omap3evm: Fix compilation error
@@ -36,5 +36,5 @@ index 6f957ed..57bce0f 100644
 };
 
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 7dc6fc29aeb2b3bc84c2a47c0794d1773e94e32e Mon Sep 17 00:00:00 2001
+From 20f244f6b795ee54f053eee5a5e0f9313a13e403 Mon Sep 17 00:00:00 2001
 From: Jarkko Nikula <jhnikula@gmail.com>
 Date: Tue, 14 Jun 2011 11:23:51 +0000
 Subject: [PATCH 019/149] omap: mcbsp: Drop SPI mode support
@@ -307,5 +307,5 @@ index 5587acf..1de2724 100644
 #define max_thres(m)			(mcbsp->pdata->buffer_size)
 #define valid_threshold(m, val)		((val) <= max_thres(m))
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From d883f2c9bafbdd44a63979caaa4d169ef09104b9 Mon Sep 17 00:00:00 2001
+From 8eea6f162c7a82d44c8e7c444cadfa43c4d586e5 Mon Sep 17 00:00:00 2001
 From: Jarkko Nikula <jhnikula@gmail.com>
 Date: Tue, 14 Jun 2011 11:23:52 +0000
 Subject: [PATCH 020/149] omap: mcbsp: Drop in-driver transfer support
@@ -544,5 +544,5 @@ index 1de2724..455eadc 100644
 	mcbsp->rx_irq = platform_get_irq_byname(pdev, "rx");
 
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 5dcb26adb60fe59e4c2dc66972e8df3e7d9c1697 Mon Sep 17 00:00:00 2001
+From 742b21718c968c17ac951b73b4ba79f4a489d35b Mon Sep 17 00:00:00 2001
 From: Arnd Bergmann <arnd@arndb.de>
 Date: Thu, 30 Jun 2011 12:58:01 +0000
 Subject: [PATCH 021/149] omap2+: fix build regression
@@ -25,5 +25,5 @@ index c6ecf60..54db41a 100644
 +	.timer		= &omap2_timer,
 MACHINE_END
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From c9641280760e72a387d56410c49f3f2586910aa9 Mon Sep 17 00:00:00 2001
+From 552daa4d00a2c1835e5114af852efc65175e1cc0 Mon Sep 17 00:00:00 2001
 From: Peter Ujfalusi <peter.ujfalusi@ti.com>
 Date: Sat, 4 Jun 2011 08:16:41 +0300
 Subject: [PATCH 022/149] OMAP: New twl-common for common TWL configuration
@@ -70,7 +70,7 @@ index 0043fa8..bcb0c58 100644
 	defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
 static struct omap2_mcspi_device_config ads7846_mcspi_config = {
 diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h
-index 6797190..a0b4a42 100644
+index 6797190..a0b4a428 100644
 --- a/arch/arm/mach-omap2/common-board-devices.h
 +++ b/arch/arm/mach-omap2/common-board-devices.h
@@ -1,33 +1,11 @@
@@ -196,5 +196,5 @@ index 0000000..e9fe2ab
 +
 +#endif /* __OMAP_PMIC_COMMON__ */
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 4910ef6a1de6a065cee3a9d786fdb07f7f8546e6 Mon Sep 17 00:00:00 2001
+From db3a6400c5bc9c99a39fe9b34b7b3c59ae4be245 Mon Sep 17 00:00:00 2001
 From: Peter Ujfalusi <peter.ujfalusi@ti.com>
 Date: Tue, 7 Jun 2011 10:26:46 +0300
 Subject: [PATCH 023/149] OMAP4: Move common twl6030 configuration to twl-common
@@ -597,5 +597,5 @@ index e9fe2ab..d96c289 100644
 +
 #endif /* __OMAP_PMIC_COMMON__ */
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From f298d33d9c793178e21b6494fc909e75330d99e4 Mon Sep 17 00:00:00 2001
+From 4a1b31f8aed87737ba84e1e5724ecfbe45732bc8 Mon Sep 17 00:00:00 2001
 From: Peter Ujfalusi <peter.ujfalusi@ti.com>
 Date: Tue, 7 Jun 2011 10:28:54 +0300
 Subject: [PATCH 024/149] OMAP3: Move common twl configuration to twl-common
@@ -600,7 +600,7 @@ index 54dceb1..7dfed24 100644
 	omap_register_i2c_bus(2, 400, NULL, 0);
 	omap_register_i2c_bus(3, 400, NULL, 0);
 diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
-index 7810b1e..75be074 100644
+index b633ba8..3cdea39 100644
 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
 +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -288,10 +288,6 @@ static struct twl4030_keypad_data rx51_kp_data = {
@@ -823,5 +823,5 @@ index d96c289..3b4b05d 100644
 			   u32 pdata_flags, u32 regulators_flags);
 
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From d88bc61a026df8d1a0223a0789cbc2a687cc7159 Mon Sep 17 00:00:00 2001
+From df02a0c8e1d42d1f861d138d1283172872c602ed Mon Sep 17 00:00:00 2001
 From: Peter Ujfalusi <peter.ujfalusi@ti.com>
 Date: Tue, 7 Jun 2011 11:38:24 +0300
 Subject: [PATCH 025/149] OMAP3: Move common regulator configuration to twl-common
@@ -722,7 +722,7 @@ index 776b444..f1f18d0 100644
 	/* i2c2 pins are used for gpio */
 	omap_register_i2c_bus(3, 400, NULL, 0);
 diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
-index 75be074..bdb24db 100644
+index 3cdea39..d99e462 100644
 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
 +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -394,10 +394,6 @@ static struct regulator_consumer_supply rx51_vaux1_consumers[] = {
@@ -920,5 +920,5 @@ index 3b4b05d..5e83a5b 100644
 
 void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq,
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 73e907e7cc7bfc4fe1115c82090470f35239bf38 Mon Sep 17 00:00:00 2001
+From 7a7bf2e165760ed106b0f4c8beb7191e3abe944f Mon Sep 17 00:00:00 2001
 From: Jarkko Nikula <jhnikula@gmail.com>
 Date: Fri, 1 Jul 2011 08:52:26 +0000
 Subject: [PATCH 026/149] omap: mcbsp: Remove rx_/tx_word_length variables
@@ -41,5 +41,5 @@ index 455eadc..3c1fbdc 100644
 	w = MCBSP_READ_CACHE(mcbsp, PCR0);
 	if (w & (FSXM | FSRM | CLKXM | CLKRM))
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From b1096b8873a8ffd74a2de22fa2edb6e138bedf83 Mon Sep 17 00:00:00 2001
+From a16f9faa682c8cdd3bbd14618600ec67e4a56963 Mon Sep 17 00:00:00 2001
 From: Jarkko Nikula <jhnikula@gmail.com>
 Date: Fri, 1 Jul 2011 08:52:27 +0000
 Subject: [PATCH 027/149] omap: mcbsp: Remove port number enums
@@ -36,7 +36,7 @@ index d9af981..ab7395d 100644
 			if (!IS_ERR(api_clk)) {
 				clk_disable(api_clk);
 diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
-index 63464ad..9882c65 100644
+index 63464ad..9882c657 100644
 --- a/arch/arm/plat-omap/include/plat/mcbsp.h
 +++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -33,7 +33,7 @@
@@ -64,5 +64,5 @@ index 63464ad..9882c65 100644
 	OMAP_MCBSP_WORD_12,
 	OMAP_MCBSP_WORD_16,
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 1dd9bfe00db002cace782002ad0b1c73bc58df16 Mon Sep 17 00:00:00 2001
+From 4e6a7403182e1e30f8b403e7931ce7c832cb5db3 Mon Sep 17 00:00:00 2001
 From: Paul Walmsley <paul@pwsan.com>
 Date: Sat, 9 Jul 2011 18:00:25 -0600
 Subject: [PATCH 028/149] OMAP: dmtimer: add missing include
@@ -27,5 +27,5 @@ index d0f3a2d..eb5d16c 100644
 #ifndef __ASM_ARCH_DMTIMER_H
 #define __ASM_ARCH_DMTIMER_H
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 701c27eeb6138dce78d3f26268cacca3c5432a15 Mon Sep 17 00:00:00 2001
+From 8a9259c5eedfeb7e2dd3e001aa68e4e1a9149b41 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Fri, 1 Jul 2011 22:54:00 +0200
 Subject: [PATCH 029/149] OMAP2+: hwmod: Fix smart-standby + wakeup support
@@ -126,5 +126,5 @@ index 1adea9c..e93438c 100644
 /* omap_hwmod_sysconfig.sysc_flags capability flags */
 #define SYSC_HAS_AUTOIDLE	(1 << 0)
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 28416cdd539f217f902178b45f52f38ec41eb779 Mon Sep 17 00:00:00 2001
+From 8823fd9b9f1d6e6406c0b98438ad6282491b0ae5 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Fri, 1 Jul 2011 22:54:01 +0200
 Subject: [PATCH 030/149] OMAP4: hwmod data: Add MSTANDBY_SMART_WKUP flag
@@ -57,5 +57,5 @@ index e1c69ff..8cbbfbf 100644
 };
 
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 4157d80213d934caea05a590e6577593553bb1f7 Mon Sep 17 00:00:00 2001
+From 3097e6265e79329635b528dd97b7fa3ed7dbb805 Mon Sep 17 00:00:00 2001
 From: Miguel Vadillo <vadillo@ti.com>
 Date: Fri, 1 Jul 2011 22:54:02 +0200
 Subject: [PATCH 031/149] OMAP2+: hwmod: Enable module in shutdown to access sysconfig
@@ -33,5 +33,5 @@ index 384d3c3..cbc2a8a 100644
 	/*
 	 * If an IP contains only one HW reset line, then assert it
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From f9a6193c656f30cfb8ec2933f2d309d599f668b0 Mon Sep 17 00:00:00 2001
+From 0b7a00a668b460c5a541d2d9d77a96cd0de3f57d Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Fri, 1 Jul 2011 22:54:03 +0200
 Subject: [PATCH 032/149] OMAP2+: hwmod: Do not write the enawakeup bit if SYSC_HAS_ENAWAKEUP is not set
@@ -61,5 +61,5 @@ index cbc2a8a..3800084 100644
 	if (oh->class->sysc->idlemodes & SIDLE_SMART_WKUP)
 		_set_slave_idlemode(oh, HWMOD_IDLEMODE_SMART, v);
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From dd2032fd1f590318049afa05127c79720b40b308 Mon Sep 17 00:00:00 2001
+From 9c5dd6c8e5a9dd6fc98e30a45a3d929034de664b Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Fri, 1 Jul 2011 22:54:04 +0200
 Subject: [PATCH 033/149] OMAP2+: hwmod: Remove _populate_mpu_rt_base warning
@@ -29,5 +29,5 @@ index 3800084..f401417 100644
 	return 0;
 }
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 47ca09682a2c2ce670196443dbb3946057bc39e6 Mon Sep 17 00:00:00 2001
+From 0fdacba393a3d2b2c87b4a9c4b2bb811bd896c09 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Fri, 1 Jul 2011 22:54:05 +0200
 Subject: [PATCH 034/149] OMAP2+: hwmod: Fix the HW reset management
@@ -83,5 +83,5 @@ index f401417..df91bb1 100644
 	if (oh->mux)
 		omap_hwmod_mux(oh->mux, _HWMOD_STATE_DISABLED);
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 41640a85e80636e7cec8dd2c1c346723c45d28bf Mon Sep 17 00:00:00 2001
+From ea1e84fd91f4bfa506f7d44c4183ab649308b940 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Fri, 1 Jul 2011 22:54:06 +0200
 Subject: [PATCH 035/149] OMAP: hwmod: Add warnings if enable failed
@@ -26,5 +26,5 @@ index df91bb1..64e9830 100644
 	return ret;
 }
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 627e72e631f0a1af0e006fd1bbb0c3b6b64bb0df Mon Sep 17 00:00:00 2001
+From 1a090fd9d66008314ef1963ff7335462b4231d8b Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Fri, 1 Jul 2011 22:54:07 +0200
 Subject: [PATCH 036/149] OMAP: hwmod: Move pr_debug to improve the readability
@@ -91,5 +91,5 @@ index 64e9830..e530bcb 100644
 		_idle_sysc(oh);
 	_del_initiator_dep(oh, mpu_oh);
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From c78354566e9811bcb93039adf4e2853ca421218e Mon Sep 17 00:00:00 2001
+From 2c900775f726b160e5ce702e75554282c2869d60 Mon Sep 17 00:00:00 2001
 From: Paul Walmsley <paul@pwsan.com>
 Date: Sat, 9 Jul 2011 19:14:05 -0600
 Subject: [PATCH 037/149] omap_hwmod: use a null structure record to terminate omap_hwmod_addr_space arrays
@@ -3525,5 +3525,5 @@ index e93438c..f3a3bff 100644
 	u8				user;
 	u8				flags;
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 0afd4751a6a25e85a46794d98fab2f266df9c696 Mon Sep 17 00:00:00 2001
+From 6d88f17e46fda46214da43af303c4f4aa442bd39 Mon Sep 17 00:00:00 2001
 From: Paul Walmsley <paul@pwsan.com>
 Date: Sat, 9 Jul 2011 19:14:06 -0600
 Subject: [PATCH 038/149] omap_hwmod: share identical omap_hwmod_addr_space arrays
@@ -1954,5 +1954,5 @@ index c34e98b..76a2f11 100644
 +
 #endif
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From ad7c2eca0bc920ad184fea27fc1d2803e66fa2cd Mon Sep 17 00:00:00 2001
+From 75a125341387435415e8390130066d56178291ef Mon Sep 17 00:00:00 2001
 From: Paul Walmsley <paul@pwsan.com>
 Date: Sat, 9 Jul 2011 19:14:06 -0600
 Subject: [PATCH 039/149] omap_hwmod: use a terminator record with omap_hwmod_mpu_irqs arrays
@@ -2900,5 +2900,5 @@ index f3a3bff..b8385e2 100644
 	u8				rst_lines_cnt;
 	u8				opt_clks_cnt;
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 12cd5e0b1bb1d3a77fcceef0570134495c959e33 Mon Sep 17 00:00:00 2001
+From 5cd00a6a7afe6757255da2256157ce5504cf4b1a Mon Sep 17 00:00:00 2001
 From: Paul Walmsley <paul@pwsan.com>
 Date: Sat, 9 Jul 2011 19:14:07 -0600
 Subject: [PATCH 040/149] omap_hwmod: share identical omap_hwmod_mpu_irqs arrays
@@ -1811,5 +1811,5 @@ index 76a2f11..1ac878c 100644
 extern struct omap_hwmod_class l3_hwmod_class;
 extern struct omap_hwmod_class l4_hwmod_class;
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 4caf196e71388ac7a932ae39fae9ea558d5317c2 Mon Sep 17 00:00:00 2001
+From e890f701dbd58ecb9377097e1a565e34cbf73e4b Mon Sep 17 00:00:00 2001
 From: Paul Walmsley <paul@pwsan.com>
 Date: Sat, 9 Jul 2011 19:14:07 -0600
 Subject: [PATCH 041/149] omap_hwmod: use a terminator record with omap_hwmod_dma_info arrays
@@ -1378,5 +1378,5 @@ index b8385e2..ce06ac6 100644
 	u8				opt_clks_cnt;
 	u8				masters_cnt;
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From a4e1221f9e6803ac9a75f396e6c8a07421d15031 Mon Sep 17 00:00:00 2001
+From 79a8b76e605e0930ef1c52c2a757eb523340cda1 Mon Sep 17 00:00:00 2001
 From: Paul Walmsley <paul@pwsan.com>
 Date: Sat, 9 Jul 2011 19:14:07 -0600
 Subject: [PATCH 042/149] omap_hwmod: share identical omap_hwmod_dma_info arrays
@@ -931,5 +931,5 @@ index 1ac878c..b636cf6 100644
 /* Common IP block data across OMAP2/3 */
 extern struct omap_hwmod_irq_info omap2_timer1_mpu_irqs[];
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 7eddbd2b6387a3a04c112a73a5d0d6ae279e98f7 Mon Sep 17 00:00:00 2001
+From 7fb59da1fff606542858e006b001e1cb63e1d708 Mon Sep 17 00:00:00 2001
 From: Paul Walmsley <paul@pwsan.com>
 Date: Sat, 9 Jul 2011 19:14:08 -0600
 Subject: [PATCH 043/149] omap_hwmod: share identical omap_hwmod_class, omap_hwmod_class_sysconfig arrays
@@ -1726,5 +1726,5 @@ index b636cf6..39a7c37 100644
 
 #endif
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 561e1560712e0e7af947695dfe492bf8919e0a1b Mon Sep 17 00:00:00 2001
+From 9723d81494f83fd1f9beb8af0f440b0ed30435fb Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:14:27 -0600
 Subject: [PATCH 044/149] OMAP4: hwmod data: Fix L3 interconnect data order and alignement
@@ -112,5 +112,5 @@ index 316e922..94c0b60 100644
 
 /* l3_main_2 -> l3_main_3 */
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 74bb828d1d68b2bebdd3c7197b198e99dff9f9c0 Mon Sep 17 00:00:00 2001
+From 27107815284e473d39b81df2ee65c1141f60a6cc Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:14:28 -0600
 Subject: [PATCH 045/149] OMAP4: hwmod data: Remove un-needed parens
@@ -38,5 +38,5 @@ index 94c0b60..7eed6a2 100644
 	.sdma_reqs	= omap44xx_uart3_sdma_reqs,
 	.main_clk	= "uart3_fck",
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From c38fbee241bc7eaea4bd9398917fbdce1996bc7d Mon Sep 17 00:00:00 2001
+From b3ef885514cc4b31d763b09dd78f26e2134c47c5 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:14:28 -0600
 Subject: [PATCH 046/149] OMAP4: hwmod data: Fix bad alignement
@@ -214,5 +214,5 @@ index 7eed6a2..1975b05 100644
 	.slaves_cnt	= ARRAY_SIZE(omap44xx_usb_otg_hs_slaves),
 	.masters	= omap44xx_usb_otg_hs_masters,
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From e9aad125ddf438b20011ea385cde2dbf0db0bc3d Mon Sep 17 00:00:00 2001
+From b47c49426b8f986331816c48996d9a64f0ebc0aa Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:14:28 -0600
 Subject: [PATCH 047/149] OMAP4: hwmod data: Align interconnect format with regular modules
@@ -150,5 +150,5 @@ index 1975b05..e011437 100644
 static struct omap_hwmod_ocp_if omap44xx_mpu__mpu_private = {
 	.master		= &omap44xx_mpu_hwmod,
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 3974d9942990d3a008ea20fc2d523f057f12a4d1 Mon Sep 17 00:00:00 2001
+From 4f6739c756baab556e7ad8ddb33c0d3fb822179a Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:14:45 -0600
 Subject: [PATCH 048/149] OMAP4: clock data: Add sddiv to USB DPLL
@@ -27,5 +27,5 @@ index 8c96567..f28a9c9 100644
 	.max_divider	= OMAP4430_MAX_DPLL_DIV,
 	.min_divider	= 1,
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 222a727d1614446275df0986ee08c011dfee64f9 Mon Sep 17 00:00:00 2001
+From 776007fbd8db1764179c9cf9f93d3b5ef2fef782 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:14:45 -0600
 Subject: [PATCH 049/149] OMAP4: clock data: Remove usb_host_fs clkdev with NULL dev
@@ -44,5 +44,5 @@ index f28a9c9..0fa1cb8 100644
 	CLK("usbhs-omap.0",	"usbtll_fck",		&dummy_ck,	CK_443X),
 	CLK(NULL,	"usim_ck",			&usim_ck,	CK_443X),
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From abc1199e6fd329eddbc8179a93aca860afc581a6 Mon Sep 17 00:00:00 2001
+From e19d3b7293245b4aad98b5ace320caad14e27c11 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:14:45 -0600
 Subject: [PATCH 050/149] OMAP4: clock data: Re-order some clock nodes and structure fields
@@ -225,5 +225,5 @@ index 0fa1cb8..4b57d55 100644
 
 int __init omap4xxx_clk_init(void)
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 426c76d0d595c7d6922a5ea1e04821b715a0b7a4 Mon Sep 17 00:00:00 2001
+From 6fdbb61306456ada90c0b0e3ee2c8245077b7b02 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:14:46 -0600
 Subject: [PATCH 051/149] OMAP4: clock data: Fix max mult and div for USB DPLL
@@ -139,5 +139,5 @@ index 006e599..f57e064 100644
 #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
 	void __iomem		*autoidle_reg;
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From b0df1335aa40e0ece7181abf4818bc676e6cff4c Mon Sep 17 00:00:00 2001
+From e96136d547a0de958c051e0ec6a0873f27a94537 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:15:04 -0600
 Subject: [PATCH 052/149] OMAP4: prcm: Fix errors in few defines name
@@ -252,5 +252,5 @@ index 67a0d3f..2aec8c8 100644
 #define OMAP4430_PRM_VC_ERRST				OMAP44XX_PRM_REGADDR(OMAP4430_PRM_DEVICE_INST, 0x00f8)
 
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From e93380c31e468f980e85b18ffc79b19b7dd88218 Mon Sep 17 00:00:00 2001
+From 6066c8802de9f6a1006a8e31aa833615060a2a5b Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:15:04 -0600
 Subject: [PATCH 053/149] OMAP4: prm: Remove wrong clockdomain offsets
@@ -46,5 +46,5 @@ index 2aec8c8..6e53120 100644
 
 /* OMAP4 specific register offsets */
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From b080e3b0c531e57f2235f6723276cd1de6fa3cef Mon Sep 17 00:00:00 2001
+From 7845ad0aca7c2976dc4021ed0c080f6605aacf09 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:15:05 -0600
 Subject: [PATCH 054/149] OMAP4: powerdomain data: Fix indentation
@@ -105,5 +105,5 @@ index c4222c7..3a7e678 100644
 
 /*
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 1994f34158452f8040f0fa1acd22475948912800 Mon Sep 17 00:00:00 2001
+From 8471ffc0eead8b884b6a00462fc57a2018fd9289 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:15:05 -0600
 Subject: [PATCH 055/149] OMAP4: cm: Remove RESTORE macros to avoid access from SW
@@ -1519,5 +1519,5 @@ index 8036a16..b9de72d 100644
 extern u32 omap4_cm2_read_inst_reg(s16 inst, u16 idx);
 extern void omap4_cm2_write_inst_reg(u32 val, s16 inst, u16 idx);
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 3685b19f9ee67549df2323a5203c1e5a639c3883 Mon Sep 17 00:00:00 2001
+From e6adacab9f633eddd83c90205bbf5a21c85c9444 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:15:06 -0600
 Subject: [PATCH 056/149] OMAP4: prcm_mpu: Fix indent in few macros
@@ -107,5 +107,5 @@ index d22d1b4..8a6e250 100644
 /* Function prototypes */
 # ifndef __ASSEMBLER__
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From f8483424a0ba5e73159ad521cd524d1cdfc8688f Mon Sep 17 00:00:00 2001
+From bbf7af412d82e488052f801f294687aaf1bf260e Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 19:15:06 -0600
 Subject: [PATCH 057/149] OMAP4: clockdomain data: Fix data order and wrong name
@@ -290,5 +290,5 @@ index a607ec1..66090f2 100644
 
 void __init omap44xx_clockdomains_init(void)
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From acc4305b143fab35cdc852f5828323af378a4792 Mon Sep 17 00:00:00 2001
+From b7fd7c4814b75005d2bf89d27e2160e863cdd5c3 Mon Sep 17 00:00:00 2001
 From: Kevin Hilman <khilman@ti.com>
 Date: Sat, 9 Jul 2011 19:15:20 -0600
 Subject: [PATCH 058/149] OMAP: omap_device: replace _find_by_pdev() with to_omap_device()
@@ -80,5 +80,5 @@ index 49fc0df..c8b9cd1 100644
 	if (new_wakeup_lat_limit == od->dev_wakeup_lat)
 		return 0;
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 8be97582ff76cae137f3c3c70ced2a49b546708c Mon Sep 17 00:00:00 2001
+From 32f213e65477010bd1ac349b4bbe438958044e9f Mon Sep 17 00:00:00 2001
 From: Jean Pihet <jean.pihet@newoldbits.com>
 Date: Sat, 9 Jul 2011 19:15:41 -0600
 Subject: [PATCH 059/149] OMAP PM: remove OMAP_PM_NONE config option
@@ -59,5 +59,5 @@ index c0a7520..0840df8 100644
 /**
  * omap_pm_if_exit - OMAP PM exit code
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From da8b469e1dfcba1559510081acc146c9bbaacca4 Mon Sep 17 00:00:00 2001
+From e2c80dceb999bf93d079d0a5a040951aad3d2359 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jon-hunter@ti.com>
 Date: Sat, 9 Jul 2011 19:14:47 -0600
 Subject: [PATCH 060/149] OMAP4: clock data: Remove McASP2, McASP3 and MMC6 clocks
@@ -174,5 +174,5 @@ index 8307c9e..96bc668 100644
 	CLK(NULL,	"pmd_trace_clk_mux_ck",		&pmd_trace_clk_mux_ck,	CK_443X),
 	CLK(NULL,	"syc_clk_div_ck",		&syc_clk_div_ck,	CK_443X),
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 458573ba88efc687c36c46cef92836ba0e7de3f2 Mon Sep 17 00:00:00 2001
+From 73203093397f6939cea566cbedc2affc51d4b597 Mon Sep 17 00:00:00 2001
 From: Jon Hunter <jon-hunter@ti.com>
 Date: Sat, 9 Jul 2011 19:14:47 -0600
 Subject: [PATCH 061/149] OMAP4: clock data: Remove UNIPRO clock nodes
@@ -95,5 +95,5 @@ index 96bc668..044df38 100644
 	CLK(NULL,	"dpll_usb_ck",			&dpll_usb_ck,	CK_443X),
 	CLK(NULL,	"dpll_usb_clkdcoldo_ck",	&dpll_usb_clkdcoldo_ck,	CK_443X),
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 602a0ca3c36da70b47f1e8223bc978c61abf157b Mon Sep 17 00:00:00 2001
+From 52d08db173e39f2af6923dc803593d62fa05e43b Mon Sep 17 00:00:00 2001
 From: Tomi Valkeinen <tomi.valkeinen@ti.com>
 Date: Sat, 9 Jul 2011 20:39:44 -0600
 Subject: [PATCH 062/149] OMAP4: hwmod data: Modify DSS opt clocks
@@ -149,5 +149,5 @@ index e011437..a7fbe5c 100644
 	.slaves_cnt	= ARRAY_SIZE(omap44xx_dss_rfbi_slaves),
 	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 1d2b343b9ad8be979162af881e63d43d3896cbd6 Mon Sep 17 00:00:00 2001
+From 1588fef412d710916847c3f383489af1559aa4b0 Mon Sep 17 00:00:00 2001
 From: Rajendra Nayak <rnayak@ti.com>
 Date: Sat, 9 Jul 2011 20:42:11 -0600
 Subject: [PATCH 063/149] OMAP2+: PM: Initialise sleep_switch to a non-valid value
@@ -35,5 +35,5 @@ index 49486f5..d48813f 100644
 
 	if (pwrdm == NULL || IS_ERR(pwrdm))
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 47d58a570faa6c6fd140fd622808071dcc1a5e01 Mon Sep 17 00:00:00 2001
+From 2e67179b61fd7b58ecbafd72fe07943620863ae7 Mon Sep 17 00:00:00 2001
 From: Benoit Cousson <b-cousson@ti.com>
 Date: Sat, 9 Jul 2011 20:42:11 -0600
 Subject: [PATCH 064/149] OMAP4: powerdomain data: Fix core mem states and missing cefuse flag
@@ -64,5 +64,5 @@ index 3a7e678..8f46e7d 100644
 
 /*
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 13fef4c46a5cbd531538c5e83846b05f1369a6c3 Mon Sep 17 00:00:00 2001
+From f54325009439b13e234374856057227edc00373c Mon Sep 17 00:00:00 2001
 From: Santosh Shilimkar <santosh.shilimkar@ti.com>
 Date: Sat, 9 Jul 2011 20:42:59 -0600
 Subject: [PATCH 065/149] OMAP4: clock data: Keep GPMC clocks always enabled and hardware managed
@@ -41,5 +41,5 @@ index 7a0b112..2578820 100644
 	.parent		= &l3_div_ck,
 	.recalc		= &followparent_recalc,
 -- 
-1.6.6.1
+1.7.2.5

@@ -1,4 +1,4 @@
-From 58a9661d288fc112392886dd09dfc40d2573335a Mon Sep 17 00:00:00 2001
+From ef733ded20f0466c32d61872f19903653f31f977 Mon Sep 17 00:00:00 2001
 From: Santosh Shilimkar <santosh.shilimkar@ti.com>
 Date: Sat, 9 Jul 2011 20:42:59 -0600
 Subject: [PATCH 066/149] OMAP4: powerdomain data: Remove unsupported MPU powerdomain state
@@ -40,5 +40,5 @@ index 8f46e7d..247e794 100644
 	.banks		  = 3,
 	.pwrsts_mem_ret	= {
 -- 
-1.6.6.1
+1.7.2.5

--- a/Show More
+++ b/Show More