require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r90"
+MACHINE_KERNEL_PR = "r91"
KERNEL_IMAGETYPE = "uImage"
-From 7bc179b1774ae4148103c2a92105f076079d00a4 Mon Sep 17 00:00:00 2001
+From aab782ab0942d6fd654311b937596b24a0ace3c6 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/48] Revert "omap3: beagle: Fix compile-time errors"
+Subject: [PATCH 01/45] Revert "omap3: beagle: Fix compile-time errors"
This commit clashes with the other beagle patches we apply on top
1 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index c5da58e..330fb25 100644
+index 865a8d7..15e48f2 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -56,22 +56,6 @@
-From d5b04454d98d62135b12c9bc50ebdc47c052f39f Mon Sep 17 00:00:00 2001
+From 06352060e3862e2c11719a6ef4ac0ae1b5f5fdf6 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/48] board-omap3touchbook: make it build against TI linux-omap 2.6.32-PSP
+Subject: [PATCH 02/45] board-omap3touchbook: make it build against TI linux-omap 2.6.32-PSP
---
arch/arm/mach-omap2/board-omap3touchbook.c | 11 +++++++++--
-From f79f1a7c2f6df54edd83932f4074c3042525a599 Mon Sep 17 00:00:00 2001
+From 4afa80923880088a3d6780257ccce72a88884e19 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/48] ARM: OMAP: add support for TCT Zippy to Beagle board file
+Subject: [PATCH 03/45] ARM: OMAP: add support for TCT Zippy to Beagle board file
Signed-off-by: Steve Sakoman <sakoman@gmail.com>
---
1 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 330fb25..ddfb9c0 100644
+index 15e48f2..a4a793f 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -21,6 +21,7 @@
/* Bus 3 is attached to the DVI port where devices like the pico DLP
* projector don't work reliably with 400kHz */
omap_register_i2c_bus(3, 100, NULL, 0);
-@@ -448,6 +514,8 @@ static void __init omap3_beagle_init(void)
+@@ -453,6 +519,8 @@ static void __init omap3_beagle_init(void)
/* REVISIT leave DVI powered down until it's needed ... */
gpio_direction_output(170, true);
-From 7622c0aa0107b742df5fc16e4d0d1a313ca7330f Mon Sep 17 00:00:00 2001
+From ef987a45a496dad17bafb2dead78513a7f820dc8 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/48] ARM: OMAP: Make beagle u-boot partition writable
+Subject: [PATCH 04/45] ARM: OMAP: Make beagle u-boot partition writable
---
arch/arm/mach-omap2/board-omap3beagle.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index ddfb9c0..9f72c7a 100644
+index a4a793f..4b2dd65 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -112,7 +112,6 @@ static struct mtd_partition omap3beagle_nand_partitions[] = {
-From 67e1584c2ea080cc74b3bf56481b402c093c66c4 Mon Sep 17 00:00:00 2001
+From 3915909dbac222212ee97bd6c8057df442a85bd3 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/48] board-omap3-beagle: add DSS2 support
+Subject: [PATCH 05/45] board-omap3-beagle: add DSS2 support
---
arch/arm/mach-omap2/board-omap3beagle.c | 130 ++++++++++++++++++++++++-------
1 files changed, 103 insertions(+), 27 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 9f72c7a..3b7f6ec 100644
+index 4b2dd65..79d43d0 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -40,6 +40,7 @@
};
static void __init omap3beagle_flash_init(void)
-@@ -522,8 +597,9 @@ static void __init omap3_beagle_init(void)
+@@ -527,8 +602,9 @@ static void __init omap3_beagle_init(void)
/* Ensure SDRC pins are mux'd for self-refresh */
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
-From 9d72ec0f11e370715e19ea51702b386b41252438 Mon Sep 17 00:00:00 2001
+From f8b1eeb8f3dc580f24b5d2a2b140c74cfa88c5eb 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/48] board-omap3beagle: prepare for DM3730 based BeagleboardXM
+Subject: [PATCH 06/45] 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
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 3b7f6ec..429dacb 100644
+index 79d43d0..b1e4d73 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -53,6 +53,23 @@
-From 76fa13c53699836c486422a8cf1ee80c173ff0ad Mon Sep 17 00:00:00 2001
+From 902bf175d5050e9f9892b594bd6093b65c1be8cc 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 07/48] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot
+Subject: [PATCH 07/45] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot
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 429dacb..ac96551 100644
+index b1e4d73..8223763 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;
static void __init omap3_beagle_init(void)
{
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
-@@ -634,8 +684,24 @@ static void __init omap3_beagle_init(void)
+@@ -639,8 +689,24 @@ static void __init omap3_beagle_init(void)
/* REVISIT leave DVI powered down until it's needed ... */
gpio_direction_output(170, true);
usb_musb_init();
usb_ehci_init(&ehci_pdata);
omap3beagle_flash_init();
-@@ -652,6 +718,8 @@ static void __init omap3_beagle_map_io(void)
+@@ -657,6 +723,8 @@ static void __init omap3_beagle_map_io(void)
omap2_map_common_io();
}
-From a48d37f4280918f3c535f350647125358e3dc1fc Mon Sep 17 00:00:00 2001
+From 35b951339ea47b542c548e102768817d4123a24b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 3 May 2010 21:38:34 +0200
-Subject: [PATCH 08/48] ARM: OMAP: beagleboard: pre-export GPIOs to userspace when using a Tincantools trainerboard
+Subject: [PATCH 08/45] ARM: OMAP: beagleboard: pre-export GPIOs to userspace when using a Tincantools trainerboard
This really needs a for loop, patches welcome
---
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index ac96551..c9af202 100644
+index 8223763..abbc1b2 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -701,7 +701,38 @@ static void __init omap3_beagle_init(void)
+@@ -706,7 +706,38 @@ static void __init omap3_beagle_init(void)
mmc[1].gpio_wp = 141;
mmc[1].gpio_cd = 162;
}
-From 89137f6fe9aafee168fe116b905cd21988fe587b Mon Sep 17 00:00:00 2001
+From 9b98719bf7787f1ec8eef6b09cb5b94100de7d12 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 3 May 2010 22:31:34 +0200
-Subject: [PATCH 09/48] ARM: OMAP: beagleboard: initialize ds1307 and eeprom only for zippy and zippy2
+Subject: [PATCH 09/45] ARM: OMAP: beagleboard: initialize ds1307 and eeprom only for zippy and zippy2
---
arch/arm/mach-omap2/board-omap3beagle.c | 39 +++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index c9af202..b3c8cb7 100644
+index abbc1b2..cb11b07 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -496,24 +496,55 @@ static struct i2c_board_info __initdata beagle_i2c1_boardinfo[] = {
-From 11ab39e32179a71675e547b160ec084be65998c2 Mon Sep 17 00:00:00 2001
+From f1e6a762a7bf8d7ff7700011f60a005f28025239 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Tue, 27 Apr 2010 10:51:15 +0200
-Subject: [PATCH 10/48] ARM: OMAP: update beagleboard defconfig
+Subject: [PATCH 10/45] ARM: OMAP: update beagleboard defconfig
---
arch/arm/configs/omap3_beagle_defconfig | 2514 +++++++++++++++++++++++++------
-From dc40bf1b03de2987fc2cfd2774e15b47e2c69b92 Mon Sep 17 00:00:00 2001
+From d9b1154227bf4fde9b08d3d5d427ef6e56e9cae1 Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Thu, 17 Dec 2009 12:45:20 -0800
-Subject: [PATCH 11/48] ASoC: enable audio capture by default for twl4030
+Subject: [PATCH 11/45] ASoC: enable audio capture by default for twl4030
---
sound/soc/codecs/twl4030.c | 4 ++--
-From 2abf4bf06de06d2e2f653f06272ca487b337197a Mon Sep 17 00:00:00 2001
+From 20276b3c5eb8dabc7169aee30ad38f9308a0572f Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Thu, 31 Dec 2009 07:05:02 -0800
-Subject: [PATCH 12/48] MTD: NAND: omap2: proper fix for subpage read ECC errors
+Subject: [PATCH 12/45] MTD: NAND: omap2: proper fix for subpage read ECC errors
---
drivers/mtd/nand/omap2.c | 11 +++++++----
-From 7a700536628f92058e2c76ec297b941cc176e156 Mon Sep 17 00:00:00 2001
+From 37bcddac7dbfe61576489e4c55b32d8b45eb1c5a Mon Sep 17 00:00:00 2001
From: Sudeep Basavaraj <sudeep.basavaraj@ti.com>
Date: Tue, 5 Jan 2010 18:58:18 +0530
-Subject: [PATCH 13/48] OMAP3630:DSS2:Enable Pre-Multiplied Alpha Support
+Subject: [PATCH 13/45] OMAP3630:DSS2:Enable Pre-Multiplied Alpha Support
Enables dss to process color formats with pre-mulitplied alpha values.
With this we can have alpha values defined for each pixel
-From d2c7e5e7904f08cb9f6639b418bed879bf921738 Mon Sep 17 00:00:00 2001
+From d03b9f3dc00274820bed99cc22d8425d6bf0e7b4 Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Tue, 19 Jan 2010 21:19:15 -0800
-Subject: [PATCH 14/48] DSS2: add bootarg for selecting svideo or composite for tv output
+Subject: [PATCH 14/45] DSS2: add bootarg for selecting svideo or composite for tv output
also add pal-16 and ntsc-16 omapfb.mode settings for 16bpp
---
}
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
-index ef29983..015831b 100644
+index 7f47a34..0fe87e0 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
-@@ -1961,7 +1961,15 @@ static int omapfb_mode_to_timings(const char *mode_str,
+@@ -1988,7 +1988,15 @@ static int omapfb_mode_to_timings(const char *mode_str,
int r;
#ifdef CONFIG_OMAP2_DSS_VENC
-From 8f6d5dae882f709cfbeab67f69aa753fb6234b2c Mon Sep 17 00:00:00 2001
+From a30000387ff4ec1ab0ca46c2429bfd184210bb24 Mon Sep 17 00:00:00 2001
From: Koen Kooi <k-kooi@ti.com>
Date: Thu, 11 Feb 2010 21:34:00 +0100
-Subject: [PATCH 15/48] ISP: add some more from Leopard imaging patch
+Subject: [PATCH 15/45] ISP: add some more from Leopard imaging patch
---
drivers/media/video/isp/isppreview.c | 16 ++++++++-
-From 528cd44b2fcd72de89a34d8e83df3930625e343e Mon Sep 17 00:00:00 2001
+From 0edbb992b0bc4e6a1b39d760695a4857b9b7ffa7 Mon Sep 17 00:00:00 2001
From: Steve Sakoman <sakoman@gmail.com>
Date: Tue, 15 Dec 2009 14:59:42 -0800
-Subject: [PATCH 16/48] ARM: OMAP: Overo: Add support for second ethernet port
+Subject: [PATCH 16/45] ARM: OMAP: Overo: Add support for second ethernet port
Signed-off-by: Steve Sakoman <sakoman@gmail.com>
---
-From 90ff4765f33c3609b441fdac87e80b65178765f6 Mon Sep 17 00:00:00 2001
+From 5c527b02d8511b5210bdddc6fcfd009bfcaff3d7 Mon Sep 17 00:00:00 2001
From: Steve Sakoman <sakoman@gmail.com>
Date: Tue, 15 Dec 2009 15:17:44 -0800
-Subject: [PATCH 17/48] drivers: net: smsc911x: return ENODEV if device is not found
+Subject: [PATCH 17/45] drivers: net: smsc911x: return ENODEV if device is not found
Signed-off-by: Steve Sakoman <sakoman@gmail.com>
---
-From cfa7b6a1efa9db8e7474aa4004bb951d5fe4df2b Mon Sep 17 00:00:00 2001
+From 88b6ac2d3b90cc8eb8d130673c96645bb439e47c Mon Sep 17 00:00:00 2001
From: Steve Sakoman <sakoman@gmail.com>
Date: Tue, 15 Dec 2009 15:24:10 -0800
-Subject: [PATCH 18/48] drivers: input: touchscreen: ads7846: return ENODEV if device is not found
+Subject: [PATCH 18/45] drivers: input: touchscreen: ads7846: return ENODEV if device is not found
Signed-off-by: Steve Sakoman <sakoman@gmail.com>
---
-From e90aa269489f8a3f8c378d2118432f1d1f52dd59 Mon Sep 17 00:00:00 2001
+From 0aee5eef478b55bf987c45ced3365099e28698cb Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Thu, 17 Dec 2009 14:19:34 -0800
-Subject: [PATCH 19/48] drivers: mfd: add twl4030 madc driver
+Subject: [PATCH 19/45] drivers: mfd: add twl4030 madc driver
---
drivers/mfd/Kconfig | 21 ++
-From 832af9ed5ced4bc0e3134af750147a4c9a374eec Mon Sep 17 00:00:00 2001
+From d93f9d5e636931519fb440cf8ad493c95bfaf5ca Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Thu, 17 Dec 2009 15:54:58 -0800
-Subject: [PATCH 20/48] ARM: OMAP: Add missing twl4030 madc header file
+Subject: [PATCH 20/45] ARM: OMAP: Add missing twl4030 madc header file
---
include/linux/i2c/twl4030-madc.h | 130 ++++++++++++++++++++++++++++++++++++++
-From 541f5da6e89cc164df95a66934cfc5ea7a0bd102 Mon Sep 17 00:00:00 2001
+From bdde1d2b9726ebf0dd74f6dad0dfc858333ca784 Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Thu, 17 Dec 2009 14:27:15 -0800
-Subject: [PATCH 21/48] ARM: OMAP: Add twl4030 madc support to Overo
+Subject: [PATCH 21/45] ARM: OMAP: Add twl4030 madc support to Overo
---
arch/arm/mach-omap2/board-overo.c | 5 +++++
-From 9d07dd8a6a1c7c9bfc582fcd1794b7e9287262fe Mon Sep 17 00:00:00 2001
+From 7775140814ed11c0332a57ed30f69c6da0ab466d Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Thu, 17 Dec 2009 14:32:36 -0800
-Subject: [PATCH 22/48] ARM: OMAP: Add twl4030 madc support to Beagle
+Subject: [PATCH 22/45] ARM: OMAP: Add twl4030 madc support to Beagle
---
arch/arm/mach-omap2/board-omap3beagle.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index b3c8cb7..dd830b1 100644
+index cb11b07..c4ebaab 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -473,6 +473,10 @@ static struct twl4030_codec_data beagle_codec_data = {
-From 772ca9b2e40a6b8d31aea65dcacc7508cc8eb353 Mon Sep 17 00:00:00 2001
+From c59df25a1d1ad6c7fbb11fac6e7404d05639f4bd Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Tue, 19 Jan 2010 20:00:46 -0800
-Subject: [PATCH 23/48] netdev: rt73usb - add vendor/device ID for Ceiva Wireless PartNo 81726-00702
+Subject: [PATCH 23/45] netdev: rt73usb - add vendor/device ID for Ceiva Wireless PartNo 81726-00702
---
drivers/net/wireless/rt2x00/rt73usb.c | 2 ++
-From de6bade40901d6a8577227e36f2feed3d39922b9 Mon Sep 17 00:00:00 2001
+From 1af64d89d41aae6ab26b61c23060a02af72b6fb2 Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Mon, 4 Jan 2010 19:20:25 -0800
-Subject: [PATCH 24/48] mmc: don't display single block read console messages
+Subject: [PATCH 24/45] mmc: don't display single block read console messages
mmc: don't display single block read console messages
---
-From 387a67b9b49028057aeb1e9bf01a4468b74a2774 Mon Sep 17 00:00:00 2001
+From 664b6e1a8f1bcd0bed227b367f7ed029a5be0fa7 Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Sun, 24 Jan 2010 09:33:56 -0800
-Subject: [PATCH 25/48] ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test
+Subject: [PATCH 25/45] ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test
otherwise it is not executed on systems that use non-twl regulators
---
-From f1b1797cab2976f07fc7c0ee9089f4f0be89e5d3 Mon Sep 17 00:00:00 2001
+From 2b3cfbcd286a0c1b0df90b7af7982c772031abd8 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sun, 14 Feb 2010 12:52:02 +0100
-Subject: [PATCH 26/48] board-overo: add PM code and sync with http://www.sakoman.com/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=shortlog;h=refs/heads/omap3-2.6.32
+Subject: [PATCH 26/45] board-overo: add PM code and sync with http://www.sakoman.com/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=shortlog;h=refs/heads/omap3-2.6.32
---
arch/arm/mach-omap2/board-overo.c | 274 ++++++++++++++++++++++++++++++++-----
-From 28d763b088bad47caac75e096bafe42e756b656d Mon Sep 17 00:00:00 2001
+From ea14002af533b155db59e15b5bccc6374aa8a5d1 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 15 Feb 2010 14:20:51 +0100
-Subject: [PATCH 27/48] twl4030-madc: adjust for twl4030 -> twl api changes
+Subject: [PATCH 27/45] twl4030-madc: adjust for twl4030 -> twl api changes
---
drivers/mfd/twl4030-madc.c | 18 +++++++++---------
-From f19824e700617d83e6409f909f4dd2f989b84e4d Mon Sep 17 00:00:00 2001
+From fea02525d71cc64fb84f011768a5f5d0bb248dc7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 15 Feb 2010 14:38:00 +0100
-Subject: [PATCH 28/48] OMAP: DSS2: (Re)add support for Samsung lte430wq-f0c panel
+Subject: [PATCH 28/45] OMAP: DSS2: (Re)add support for Samsung lte430wq-f0c panel
---
drivers/video/omap2/displays/Kconfig | 6 +
-From f4fb5594b92a347689692f17900df4a0a0c54c04 Mon Sep 17 00:00:00 2001
+From 528f8c676d21e4eea4599226168f25e684f99eae Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Thu, 17 Dec 2009 15:05:30 -0800
-Subject: [PATCH 29/48] OMAP: DSS2: Add support for LG Philips LB035Q02 panel
+Subject: [PATCH 29/45] OMAP: DSS2: Add support for LG Philips LB035Q02 panel
---
drivers/video/omap2/displays/Kconfig | 6 +
-From 790f4a8c72bb800890c37aac61fd16153a2a46a8 Mon Sep 17 00:00:00 2001
+From 5615ccd89eb521c2365992bdb7c08879fe039daa Mon Sep 17 00:00:00 2001
From: Kishore Kadiyala <kishore.kadiyala@ti.com>
Date: Wed, 17 Feb 2010 19:34:47 +0530
-Subject: [PATCH 30/48] Fix for bus width which improves SD card's peformance.
+Subject: [PATCH 30/45] Fix for bus width which improves SD card's peformance.
This patch fixes bus width which improves peformance for SD cards.
OMAP-MMC controller's can support maximum bus width of '8'.
-From 750b19e0def4d0f5cb8470c104d4faf75f174e0f Mon Sep 17 00:00:00 2001
+From 14b44ddc3119dc497b4d17901884af4f068c5ada Mon Sep 17 00:00:00 2001
From: Imre Deak <imre.deak@nokia.com>
Date: Thu, 4 Feb 2010 21:38:02 +0200
-Subject: [PATCH 31/48] ARM: VFP: add support to sync the VFP state of the current thread
+Subject: [PATCH 31/45] ARM: VFP: add support to sync the VFP state of the current thread
ARM: VFP: add support to sync the VFP state of the current thread
-From 7dfe8fa0ce49a3414fa3d42c05e1526e2a5b7a27 Mon Sep 17 00:00:00 2001
+From 7cdc806843b28f0f35dd41fb79aac815773a3550 Mon Sep 17 00:00:00 2001
From: Imre Deak <imre.deak@nokia.com>
Date: Thu, 4 Feb 2010 21:38:30 +0200
-Subject: [PATCH 32/48] ARM: VFP: preserve the HW context when calling signal handlers
+Subject: [PATCH 32/45] ARM: VFP: preserve the HW context when calling signal handlers
ARM: VFP: preserve the HW context when calling signal handlers
-From 30676dadf0aa367bc298a17858c9d99a99659a91 Mon Sep 17 00:00:00 2001
+From 19f0835c3c8fa52280ae74bbc23dce747708f4af Mon Sep 17 00:00:00 2001
From: Prabindh Sundareson <prabu@ti.com>
Date: Wed, 3 Mar 2010 15:45:35 +0100
-Subject: [PATCH 33/48] Switch SGX clocks to 200MHz on DM37xx/OMAP36xx
+Subject: [PATCH 33/45] Switch SGX clocks to 200MHz on DM37xx/OMAP36xx
---
arch/arm/mach-omap2/clock34xx_data.c | 4 ++--
-From 9d205e416f4e6bf93de7b5ecc361dd9a181bbb84 Mon Sep 17 00:00:00 2001
+From 2f4193b92096394cfd56e3757c8d6ca8e13d5c4d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 8 Mar 2010 14:38:31 +0100
-Subject: [PATCH 34/48] modedb.c: add proper 720p60 mode
+Subject: [PATCH 34/45] modedb.c: add proper 720p60 mode
---
drivers/video/modedb.c | 4 ++++
-From d8f1087c93b54027514f1dacd3c12a71eb691344 Mon Sep 17 00:00:00 2001
+From 237492efd365a0f69d41d818fc368f5621aa8f3b Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Thu, 4 Feb 2010 12:26:22 -0800
-Subject: [PATCH 35/48] RTC: add support for backup battery recharge
+Subject: [PATCH 35/45] RTC: add support for backup battery recharge
---
drivers/rtc/rtc-twl.c | 25 +++++++++++++++++++++++++
-From 4b1758fb393aefec27bd500ba64fed6b65da9d8d Mon Sep 17 00:00:00 2001
+From aa2753fcce815b4a86be5c95238cf029a948e5ff Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Mon, 13 Oct 2008 20:32:16 +0100
-Subject: [PATCH 36/48] ARM: Add prompt for CONFIG_ALIGNMENT_TRAP
+Subject: [PATCH 36/45] ARM: Add prompt for CONFIG_ALIGNMENT_TRAP
This adds a prompt text for CONFIG_ALIGNMENT_TRAP, thus making it
visible in make *config.
-From c250cb2423618f253b91092d50420a20ba5fc914 Mon Sep 17 00:00:00 2001
+From a265396d38d93b371dbba020fb64aee42b4d4905 Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Sat, 28 Mar 2009 13:21:55 +0000
-Subject: [PATCH 37/48] ARM: Print warning on alignment trap in kernel mode
+Subject: [PATCH 37/45] ARM: Print warning on alignment trap in kernel mode
Signed-off-by: Mans Rullgard <mans@mansr.com>
---
-From 7b3244f2af34c731557fa8f75f26f3987c4f3ec9 Mon Sep 17 00:00:00 2001
+From b2792916bb10bdd3093bf88ca62064a3b10ad877 Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Tue, 10 Nov 2009 00:39:21 +0000
-Subject: [PATCH 38/48] ARM: Expose some CPU control registers via sysfs
+Subject: [PATCH 38/45] ARM: Expose some CPU control registers via sysfs
This creates sysfs files under /sys/devices/system/cpu/cpuN
exposing the values of the control register, auxiliary control
-From 3a9cdc003dd90261fa0473418daf792162d59de2 Mon Sep 17 00:00:00 2001
+From f9ab0732a5302bd52026f92430c91b253aa4111b Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Tue, 10 Nov 2009 00:41:54 +0000
-Subject: [PATCH 39/48] ARM: Add option to allow userspace PLE access
+Subject: [PATCH 39/45] ARM: Add option to allow userspace PLE access
This adds a Kconfig option to allow userspace to access the L2 preload
engine (PLE) found in Cortex-A8.
-From 8a84e3d947230c1031254884d8fff18a54b77df5 Mon Sep 17 00:00:00 2001
+From 6efdc547be5f685b4f29b05eba73cb56441fd898 Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Tue, 10 Nov 2009 00:52:56 +0000
-Subject: [PATCH 40/48] ARM: Add option to allow userspace access to performance counters
+Subject: [PATCH 40/45] ARM: Add option to allow userspace access to performance counters
This adds an option to allow userspace access to the performance monitor
registers of the Cortex-A8.
-From d54211da37c7ac61956381359b7504f9fde38c47 Mon Sep 17 00:00:00 2001
+From 51643be36a5b45636cd7208a81a09638d7913604 Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Sat, 28 Mar 2009 13:05:02 +0000
-Subject: [PATCH 41/48] ARM: Expose some PMON registers through sysfs
+Subject: [PATCH 41/45] ARM: Expose some PMON registers through sysfs
---
arch/arm/kernel/sysfs_v7.c | 11 +++++++++++
-From 3770853bc0a25112b5f50811c75079a41cdb81da Mon Sep 17 00:00:00 2001
+From 38d07e3ffe848680df123f7422ec4b150bbc8f68 Mon Sep 17 00:00:00 2001
From: Ajay Kumar Gupta <ajay.gupta@ti.com>
Date: Wed, 14 Apr 2010 16:08:37 +0530
-Subject: [PATCH 42/48] musb: allow host io without gadget module
+Subject: [PATCH 42/45] musb: allow host io without gadget module
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
---
-From 6678e3fcadf0e562b30798791d6396d7b57c3b7b Mon Sep 17 00:00:00 2001
+From 089d3a51f0467d68c42b2df88a6f9a0488aada47 Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Mon, 26 Apr 2010 11:17:26 -0700
-Subject: [PATCH 43/48] MTD: silence ecc errors on mtdblock0
+Subject: [PATCH 43/45] MTD: silence ecc errors on mtdblock0
mtdblock0 is the x-load partition, which uses hw ecc
this confuses linux, which uses sw ecc
-From 98916b700d91e3a2cf811cdba0ed5a1903dcb1ce Mon Sep 17 00:00:00 2001
+From 2db9c35d01af6f4b3e44fac3466b5d6b62e52232 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Thu, 13 May 2010 21:43:08 +0200
-Subject: [PATCH 44/48] ARM: OMAP: beagle: every known beagle (except revB) uses 2 chipselects so don't use NULL for the second chipselect timings
+Subject: [PATCH 44/45] ARM: OMAP: beagle: every known beagle (except revB) uses 2 chipselects so don't use NULL for the second chipselect timings
---
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 dd830b1..078e026 100644
+index c4ebaab..4aa91cb 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -614,7 +614,7 @@ static void __init omap3_beagle_init_irq(void)
-From fb0e78890ed606930231a32ea7d9b84ce0a88f58 Mon Sep 17 00:00:00 2001
+From 46df6bfeaff6f64bfae3fd9ac930bd6c768a352f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sat, 15 May 2010 21:47:32 +0200
-Subject: [PATCH 45/48] ARM: OMAP: beagle: add support for beagleFPGA expansionboard: http://members.cox.net/ebrombaugh1/embedded/beagle/beagle_fpga.html
+Subject: [PATCH 45/45] ARM: OMAP: beagle: add support for beagleFPGA expansionboard: http://members.cox.net/ebrombaugh1/embedded/beagle/beagle_fpga.html
---
arch/arm/mach-omap2/board-omap3beagle.c | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 078e026..b313350 100644
+index 4aa91cb..93b9e5f 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -24,6 +24,7 @@
static void __init omap3_beagle_init_irq(void)
{
if (cpu_is_omap3630())
-@@ -769,6 +789,12 @@ static void __init omap3_beagle_init(void)
+@@ -774,6 +794,12 @@ static void __init omap3_beagle_init(void)
gpio_export(162, 1);
}
-From 4a505672e75774854a02bf5c2a6c17f0789b1c93 Mon Sep 17 00:00:00 2001
+From a03a0f8d0c856a152f477efea64e7df1c927c9b1 Mon Sep 17 00:00:00 2001
From: OpenEmbedded User <oe@OE-builder.(none)>
Date: Tue, 9 Feb 2010 17:16:13 +0100
-Subject: [PATCH 01/71] mt9t111: first stab at merging sensor driver based on a patch by Leopard Imaging
+Subject: [PATCH 01/75] mt9t111: first stab at merging sensor driver based on a patch by Leopard Imaging
---
drivers/media/video/Kconfig | 8 +
+++ /dev/null
-From d10aa1882d560d968dd61fb49ad1eeab5df84079 Mon Sep 17 00:00:00 2001
-From: Sergio Aguirre <saaguirre@ti.com>
-Date: Thu, 22 Jul 2010 17:29:20 -0500
-Subject: [PATCH 1/3] omap3beagle: Partial revert "HACK: try to poweron stuff on xM rev A"
-
-In this commit:
-
- commit 0e0b2c1a7a3212e47e2fb07116f1b31914152f76
- Author: Koen Kooi <koen@dominion.thruhere.net>
- Date: Tue May 4 17:04:27 2010 +0200
-
- HACK: try to poweron stuff on xM rev A
-
-There is a change introduced to modify the gpio init value after
-setting its mode to output.
-
-This was breaking somehow the camera. The sensor powerup sequence
-was returning -EBUSY.
-
-Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
----
- arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 9bca9fa..3d05bfa 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -387,7 +387,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
-
- /* 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, 0);
-+ gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
- }
- else {
- /* DVI reset GPIO is different between revisions */
---
-1.6.6.1
-
-From 5b1011bc9c2172027f3c84fa56b9f0e090e85193 Mon Sep 17 00:00:00 2001
+From 29157ffef7f3813c1ec23f9d11eb485242d53454 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 11 Jun 2010 13:51:49 -0500
-Subject: [PATCH 02/71] mt9t111: Fix all checkpatch errors
+Subject: [PATCH 02/75] mt9t111: Fix all checkpatch errors
The code was plagued with checkpatch errors. Fix them!
-From e8188ea4c58ddf1b7006703b9caca3554fec68d7 Mon Sep 17 00:00:00 2001
+From e6af1e25ce53f1011fe6a1920cc9877ae51d2e95 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 11 Jun 2010 16:17:56 -0500
-Subject: [PATCH 03/71] mt9t111: Pass v4l2_int_device data
+Subject: [PATCH 03/75] mt9t111: Pass v4l2_int_device data
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 06ff02b8346c0ed77fabba84a1b984f53bfaecb6 Mon Sep 17 00:00:00 2001
+From e91589e4c2736495be6f1252599d5115b33ac8c8 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 11 Jun 2010 16:15:58 -0500
-Subject: [PATCH 04/71] omap3beagle: Add camera support
+Subject: [PATCH 04/75] omap3beagle: Add camera support
This is tested with the xM + Leopard imaging module camera, which
has a MT9T111.
+
+#endif /* __BOARD_OMAP3BEAGLE_LMB_H_ */
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index b313350..d6b69a6 100644
+index 93b9e5f..31de2f9 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -712,6 +712,31 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = {
-From e09768af6603baf2c692567f8651576152f021fe Mon Sep 17 00:00:00 2001
+From 1f6871f7ea78c182ebc1ac4b743485b1d48f2882 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 11 Jun 2010 16:18:30 -0500
-Subject: [PATCH 05/71] TEMP: omap3beagle: camera: Add defconfig
+Subject: [PATCH 05/75] TEMP: omap3beagle: camera: Add defconfig
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From f99548efe1161c4f5418dcacb598b1c9637ca7d5 Mon Sep 17 00:00:00 2001
+From 0f967d630fb4b3e55f202b91cbabbd631107923d Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 11 Jun 2010 16:50:39 -0500
-Subject: [PATCH 06/71] omap3beagle: camera: Add support for regulators
+Subject: [PATCH 06/75] omap3beagle: camera: Add support for regulators
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
+}
arch_initcall(omap3beaglelmb_init);
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index d6b69a6..aa16acd 100644
+index 31de2f9..448ab23 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -403,6 +403,56 @@ static struct twl4030_gpio_platform_data beagle_gpio_data = {
-From 7d5f49845f06feadb9bc97d458d1ce03814ff5f4 Mon Sep 17 00:00:00 2001
+From 4b111d4e4f4050db9fcca746f9b8a893d3d60f98 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 11 Jun 2010 16:52:25 -0500
-Subject: [PATCH 07/71] TEMP: omap3beagle: cam: Enable OMAP_MUX
+Subject: [PATCH 07/75] TEMP: omap3beagle: cam: Enable OMAP_MUX
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 74fef5ae63ecf623ea3accdff05b092699437b11 Mon Sep 17 00:00:00 2001
+From e5dc69cd15b96c2ffc5807a4127a94a32c9b4242 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 11 Jun 2010 17:53:50 -0500
-Subject: [PATCH 08/71] omap3beagle: camera: Fix null pointer dereference
+Subject: [PATCH 08/75] omap3beagle: camera: Fix null pointer dereference
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 6d9afea5e436a57e66efd2784aa299e1baf3fe3a Mon Sep 17 00:00:00 2001
+From 0c7579c682c3eb3dc5190e1b28743be0b33571e3 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Wed, 16 Jun 2010 03:23:57 +0300
-Subject: [PATCH 09/71] Revert "TEMP: omap3beagle: cam: Enable OMAP_MUX"
+Subject: [PATCH 09/75] Revert "TEMP: omap3beagle: cam: Enable OMAP_MUX"
This reverts commit 7d5f49845f06feadb9bc97d458d1ce03814ff5f4.
-From 9ff295528695c3a1b0a369e989f556db02ddf6b9 Mon Sep 17 00:00:00 2001
+From d14c2924e8bb7d9a864dfeb0aca37ef9fc913f7d Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Wed, 16 Jun 2010 04:28:06 +0300
-Subject: [PATCH 10/71] omap3beagle: camera: Change arch -> late_initcall
+Subject: [PATCH 10/75] omap3beagle: camera: Change arch -> late_initcall
This is for ensuring that the regulators are initialized already.
-From 4855949888a0ad8aca69c1ca3eefc7fbc8dad6f9 Mon Sep 17 00:00:00 2001
+From 527c026c03e34471e34a731322422eacbb30fb35 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Wed, 16 Jun 2010 04:58:46 +0300
-Subject: [PATCH 11/71] omap3beagle: camera: Move i2c registration to the main board
+Subject: [PATCH 11/75] omap3beagle: camera: Move i2c registration to the main board
This is because the board-omap3beagle-camera.c file now is
late_initcall, and the i2c bus registration needed to be before
printk(KERN_INFO MODULE_NAME ": Driver registration complete \n");
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index aa16acd..757d430 100644
+index 448ab23..97ccf04 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -71,6 +71,11 @@ static struct omap_opp * _omap35x_l3_rate_table = NULL;
-From e37a8b39623910576c5784ccc10229fabe51b4c3 Mon Sep 17 00:00:00 2001
+From 860ff4be70242f2d2964e0d431d09231cbf6bfde Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 16 Jun 2010 09:45:46 +0200
-Subject: [PATCH 12/71] ARM: OMAP3: make camera code build if MT9T111 is built as module or disabled
+Subject: [PATCH 12/75] ARM: OMAP3: make camera code build if MT9T111 is built as module or disabled
---
arch/arm/mach-omap2/board-omap3beagle.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 757d430..1e9a868 100644
+index 97ccf04..3d4b0bc 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -71,7 +71,7 @@ static struct omap_opp * _omap35x_l3_rate_table = NULL;
-From cc677d0cce4b39b7091e1e8c5675e98518968d3e Mon Sep 17 00:00:00 2001
+From 1326478d7bdb80f9d7d791e54eeead48ece93bff Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Wed, 23 Jun 2010 15:03:24 -0500
-Subject: [PATCH 13/71] DEBUG: omap3beagle: camera: Force mode0 in cam_xclka
+Subject: [PATCH 13/75] DEBUG: omap3beagle: camera: Force mode0 in cam_xclka
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 62155e17564a986215d61697c6b8a20cc0b4e07f Mon Sep 17 00:00:00 2001
+From 484186abcf6d44cc690c73d68148edde8b0b365b Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 4 Feb 2010 18:12:37 -0600
-Subject: [PATCH 14/71] OMAP3: CLOCK: Add capability to change rate of dpll4_m5_ck_3630
+Subject: [PATCH 14/75] OMAP3: CLOCK: Add capability to change rate of dpll4_m5_ck_3630
Add necessary clk_sel definitions to clock framework to allow changing
dpll4_m5_ck_3630 rate.
-From 2cda8f55cb01496f88ba9ad15a276f84eaa02870 Mon Sep 17 00:00:00 2001
+From 327cb4ef7120d00bcc6a725375f2eb6aa02de899 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 24 Jun 2010 14:27:39 -0500
-Subject: [PATCH 15/71] Revert "DEBUG: omap3beagle: camera: Force mode0 in cam_xclka"
+Subject: [PATCH 15/75] Revert "DEBUG: omap3beagle: camera: Force mode0 in cam_xclka"
This reverts commit 158e14b3d449dde2c6aa9f8cddb86fbbee2d2cd7.
---
-From 6add1bee85d7cbe5c89650b1325ee345aba904cd Mon Sep 17 00:00:00 2001
+From eb9738897009bea572be12bfb812c9a5ad8ef293 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 24 Jun 2010 17:31:49 -0500
-Subject: [PATCH 16/71] omap3beagle: camera: Fix wrong XCLKA selection
+Subject: [PATCH 16/75] omap3beagle: camera: Fix wrong XCLKA selection
The CAM_USE_XCLKA should have been 0 instead of 1.
-From da7a0c9d99ac42332cab5fcc961006a56531e1c4 Mon Sep 17 00:00:00 2001
+From 26b873e74231529962132d9d80c8921b584f6e84 Mon Sep 17 00:00:00 2001
From: Tuukka Toivonen <tuukka.o.toivonen@nokia.com>
Date: Thu, 2 Jul 2009 16:17:55 +0200
-Subject: [PATCH 17/71] omap3isp: set CAM_MCLK to 172.8 MHz, allows exact 9.6 MHz for camera xclka/b
+Subject: [PATCH 17/75] omap3isp: set CAM_MCLK to 172.8 MHz, allows exact 9.6 MHz for camera xclka/b
Camera cam_xclka and cam_xclkb clocks are generated by dividing
CAM_MCLK with an integer. We want to use 9.6 MHz for cameras,
-From fc51d55718e20246c18c45c9e5545a0ef31d8b05 Mon Sep 17 00:00:00 2001
+From 1156c4406ff37b425c596804624ad6014006fcc1 Mon Sep 17 00:00:00 2001
From: Penda, Naveen <pnaveen@ti.com>
Date: Thu, 22 Oct 2009 06:07:01 +0530
-Subject: [PATCH 18/71] Fix: Moved MCLK setting to the board file
+Subject: [PATCH 18/75] Fix: Moved MCLK setting to the board file
This patch provides the flexibility to set the MCLK frequency
from the board file
-From 4f010e99c75490daf2f89cf5aed95ea5cd1f3fad Mon Sep 17 00:00:00 2001
+From 3da817ad292e1414b175484cf384f1fcca351493 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Wed, 25 Nov 2009 12:30:46 -0600
-Subject: [PATCH 19/71] omap3isp: core: Do smarter MCLK setting
+Subject: [PATCH 19/75] omap3isp: core: Do smarter MCLK setting
Since the ratio between MCLK and DPLL4_M5 could not be 1:1
(i.e. on 3430 its 2:1), it's necessary to check ratio
-From 140f36e6a0a01ccef5a13ff2a1a466bd38fa3b2d Mon Sep 17 00:00:00 2001
+From 434ac18f2ac9969570dd9347f9933f4ed5147749 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 24 Jun 2010 16:34:13 -0500
-Subject: [PATCH 20/71] omap3beagle: camera: set mclk for mt9t111
+Subject: [PATCH 20/75] omap3beagle: camera: set mclk for mt9t111
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 04f40f398ac899504e4836e78f8e791f98200cf2 Mon Sep 17 00:00:00 2001
+From f32acfd90df92c93328c093c2414f6a11b98ce57 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 24 Jun 2010 17:43:23 -0500
-Subject: [PATCH 21/71] mt9t111: Fix max supported xclk
+Subject: [PATCH 21/75] mt9t111: Fix max supported xclk
According to Aptina documentation, the max should be 54 MHz, not 75 MHz.
-From 769bd80474aeb9951046336c4332f1cee3d27619 Mon Sep 17 00:00:00 2001
+From b5058c1ca4af6076dff7e1f592f871030ba31a95 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 24 Jun 2010 17:53:55 -0500
-Subject: [PATCH 22/71] omap3beagle: camera: Clarify regulators names
+Subject: [PATCH 22/75] omap3beagle: camera: Clarify regulators names
Changed:
- beagle_mt9t111_reg1 -> beagle_mt9t111_1_8v
-From 1f300b7451ed1aef6f9b9902f2070b7340cb4d0a Mon Sep 17 00:00:00 2001
+From 294459d9500c75256cff282f441b6cf68077a3e9 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 24 Jun 2010 18:21:52 -0500
-Subject: [PATCH 23/71] omap3beagle: camera: Fix powerup sequence
+Subject: [PATCH 23/75] omap3beagle: camera: Fix powerup sequence
The powerup sequence was very incomplete. After revisiting the
Aptina developer's guide, the resulting powerup sequence is followed.
-From 838274e9850c8dfbb723c892604b017ebf5f0528 Mon Sep 17 00:00:00 2001
+From 967227a235ddafbc5a5391093e95a12972e93e9d Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 25 Jun 2010 11:24:07 -0500
-Subject: [PATCH 24/71] omap3beagle: camera: Change vaux4 to 1.8v
+Subject: [PATCH 24/75] omap3beagle: camera: Change vaux4 to 1.8v
Both voltage sources seem to need 1.8v.
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 1e9a868..af9b818 100644
+index 3d4b0bc..09e8459 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -446,8 +446,8 @@ static struct regulator_init_data beagle_vaux3 = {
-From b8f60d7198d5df18336cb0151ac593cfa422f83a Mon Sep 17 00:00:00 2001
+From f5bc21e02cfc66734591104ec1b58556dccfed70 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 25 Jun 2010 12:03:59 -0500
-Subject: [PATCH 25/71] omap3beagle: camera: Rename regulators to match actual voltage levels
+Subject: [PATCH 25/75] omap3beagle: camera: Rename regulators to match actual voltage levels
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From f01fb232e43dcbc8f61c2ed29d8eb865ebb386b7 Mon Sep 17 00:00:00 2001
+From 871c9ac8687787ff29c5445325acf1ca388b9563 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 25 Jun 2010 12:04:48 -0500
-Subject: [PATCH 26/71] omap3beagle: camera: Complement remainig sensor hw config settings
+Subject: [PATCH 26/75] omap3beagle: camera: Complement remainig sensor hw config settings
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 5c343b5261a3a7382cb9aa414be9f1b57acb3056 Mon Sep 17 00:00:00 2001
+From a5693b7d9b22036323edf1e4200e6e59f67e8f9d Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 25 Jun 2010 13:43:54 -0500
-Subject: [PATCH 27/71] mt9t111: Fix detect function retval and cleanup prints
+Subject: [PATCH 27/75] mt9t111: Fix detect function retval and cleanup prints
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 8ece4d6cbc52b7a41d1feb411d62c84cebc1e9fe Mon Sep 17 00:00:00 2001
+From 7417633c6dbf657cf3778800d59e94a9b7bf6942 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 25 Jun 2010 16:01:00 -0500
-Subject: [PATCH 28/71] omap3beagle: camera: Set padconf settings in cam init
+Subject: [PATCH 28/75] omap3beagle: camera: Set padconf settings in cam init
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 0e5fd12767472b52744c5dce43c77451aa89ba3d Mon Sep 17 00:00:00 2001
+From 6cce810371e763a367b69a38e53635657804694c Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sun, 27 Jun 2010 16:11:39 +0200
-Subject: [PATCH 29/71] omap3beagle: camera: only register camera driver for 36xx based SoCs
+Subject: [PATCH 29/75] omap3beagle: camera: only register camera driver for 36xx based SoCs
This is a workaround for the bootcrash when used on 35xx based beagleboards.
-From 250e5bf211583993d5e56cb5fc736a07945fa496 Mon Sep 17 00:00:00 2001
+From 05232a5ba68cab14877a4032cc7995c15254195d Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 25 Jun 2010 16:01:47 -0500
-Subject: [PATCH 30/71] WIP: mt9t111: Work in progress for camera enablement
+Subject: [PATCH 30/75] WIP: mt9t111: Work in progress for camera enablement
This is changing so far:
- Remove useless printk's in enum_frameinterval calls.
-From eed14c95dbe46b0e34b489ad5e0452654e0f1661 Mon Sep 17 00:00:00 2001
+From 4080bcdb05f5fdb51a16faa011a68205f0cb7482 Mon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Wed, 7 Jul 2010 11:55:43 +0530
-Subject: [PATCH 31/71] BeagleXM:Cam: Add support for MT9V113 VGA Sensor
+Subject: [PATCH 31/75] BeagleXM:Cam: Add support for MT9V113 VGA Sensor
This patch replaces the MT9T111 to MT9V113 sensor.
---
}
late_initcall(omap3beaglelmb_init);
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index af9b818..d4b0b0a 100644
+index 09e8459..6835c1a 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -71,10 +71,10 @@ static struct omap_opp * _omap35x_l3_rate_table = NULL;
.mode = SPI_MODE_1,
},
};
-@@ -830,7 +830,7 @@ static void __init omap3_beagle_init(void)
+@@ -835,7 +835,7 @@ static void __init omap3_beagle_init(void)
/* REVISIT leave DVI powered down until it's needed ... */
gpio_direction_output(170, true);
{
printk(KERN_INFO "Beagle expansionboard: initializing enc28j60\n");
omap3beagle_enc28j60_init();
-@@ -838,8 +838,8 @@ static void __init omap3_beagle_init(void)
+@@ -843,8 +843,8 @@ static void __init omap3_beagle_init(void)
mmc[1].gpio_wp = 141;
mmc[1].gpio_cd = 162;
}
{
printk(KERN_INFO "Beagle expansionboard: initializing ks_8851\n");
omap3beagle_ks8851_init();
-@@ -880,7 +880,7 @@ static void __init omap3_beagle_init(void)
+@@ -885,7 +885,7 @@ static void __init omap3_beagle_init(void)
}
if(!strcmp(expansionboard_name, "beaglefpga"))
-From 85fc82296bf6f9eaaad63e0aee2c0ec98a0d6ed9 Mon Sep 17 00:00:00 2001
+From b4d9f3d3f45b3f47ec243df170381b0c2d1049e7 Mon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Fri, 9 Jul 2010 17:38:09 +0530
-Subject: [PATCH 32/71] MT9V113: Fixed sensor nitialization issues
+Subject: [PATCH 32/75] MT9V113: Fixed sensor nitialization issues
With this patch sensor is now able to generate HS, VS and pixel clock, also
CCDC is able to generate HS/VS, VD0, VD1 interrupts.
-From 7838aaa29f4b131cb034d56ea41b900ff9f04551 Mon Sep 17 00:00:00 2001
+From 77361cf426202a92395921c25e77190b8fb0cdd6 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 9 Jul 2010 16:22:38 -0500
-Subject: [PATCH 33/71] mt9v113: Fix wrong active widths
+Subject: [PATCH 33/75] mt9v113: Fix wrong active widths
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 242df5600b1bb1173670846eac802840d4601de0 Mon Sep 17 00:00:00 2001
+From d6e6a76aa9d842ed9f8963ed10fc884cff3af5dd Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 9 Jul 2010 16:56:18 -0500
-Subject: [PATCH 34/71] omap3isp: Fix Wrong check on non-interlaced sensor on isr
+Subject: [PATCH 34/75] omap3isp: Fix Wrong check on non-interlaced sensor on isr
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 6a768a155a2758aa55e27574dd2e5d268b54079b Mon Sep 17 00:00:00 2001
+From e069619a821aca3569440a4d8ccf3727ebe80ddd Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Sat, 10 Jul 2010 09:51:16 -0500
-Subject: [PATCH 35/71] omap3isp: Fix bad YUV_BT checks in datapath_config
+Subject: [PATCH 35/75] omap3isp: Fix bad YUV_BT checks in datapath_config
The use of an external write enable signals (from ISP point of
view) shouldn't depend on the sensor parallel interface type.
-From 92135e4024ba2115305da23acb9d13bd0f9251b1 Mon Sep 17 00:00:00 2001
+From 2f4a4612cd2fa21468f708a9c981e39a3927611f Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Sat, 10 Jul 2010 09:57:40 -0500
-Subject: [PATCH 36/71] omap3isp: Set vd_pol to 0 by default on all cases
+Subject: [PATCH 36/75] omap3isp: Set vd_pol to 0 by default on all cases
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 059f8c94d288f5e40f38aa86344ae7556c0f0f45 Mon Sep 17 00:00:00 2001
+From 67e3840b98c88da4417e386d3e955385a120138e Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Mon, 12 Jul 2010 14:09:38 -0500
-Subject: [PATCH 37/71] omap3isp: ccdc: Set datalines to 10 for YUV_SYNC
+Subject: [PATCH 37/75] omap3isp: ccdc: Set datalines to 10 for YUV_SYNC
Most of the sensors we use are 10 bits, so set this as
default.
-From 35c871dc139883d790a0080b9f3a9bfcf0a5a24c Mon Sep 17 00:00:00 2001
+From efa8018485d29f3545e174dc10af0d01b9197077 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Mon, 12 Jul 2010 14:11:44 -0500
-Subject: [PATCH 38/71] omap3beagle: camera: Fix parallel i/f settings
+Subject: [PATCH 38/75] omap3beagle: camera: Fix parallel i/f settings
This makes the sensor input be shifted from 13:4 -> 9:0, as
in YUV streaming, the 8 least significant pins are used.
-From a776cd344136f046bea77e223bf53912cd5f21bc Mon Sep 17 00:00:00 2001
+From 9f2341ea93de0e76d71c075791cdada7b9ce163b Mon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Tue, 13 Jul 2010 19:38:51 +0530
-Subject: [PATCH 39/71] omap3beagle-camera:Clean up: Remove unneccessary code/printf
+Subject: [PATCH 39/75] omap3beagle-camera:Clean up: Remove unneccessary code/printf
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
-From aea0e79b7ace8ffc3b6752276d693af54a23cdb8 Mon Sep 17 00:00:00 2001
+From c0b564c145013ca024787702dc9f43c56016c5ec Mon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Tue, 13 Jul 2010 19:39:34 +0530
-Subject: [PATCH 40/71] mt9v113:Clean Up: Remove unneccessary code/printf
+Subject: [PATCH 40/75] mt9v113:Clean Up: Remove unneccessary code/printf
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
-From ffaa0e141898987cba2618d8e5b0ef2a285e79a9 Mon Sep 17 00:00:00 2001
+From b174adfdb2836b01f8306f6112b7a8c36540f7d2 Mon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Tue, 13 Jul 2010 19:40:39 +0530
-Subject: [PATCH 41/71] MT9V113: Min, Max clk input changed as per the spec
+Subject: [PATCH 41/75] MT9V113: Min, Max clk input changed as per the spec
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
-From 3db061a3a65a93a0b5a4bd6c7619e4082c098b7f Mon Sep 17 00:00:00 2001
+From a23ae536374534ed021479b63ec093d5e58a9186 Mon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Wed, 14 Jul 2010 19:07:06 +0530
-Subject: [PATCH 42/71] omap3beagle-camera: Further clode cleanup
+Subject: [PATCH 42/75] omap3beagle-camera: Further clode cleanup
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
-From b61ff796dd0bb5bb34d7d2125983baa78f8a3831 Mon Sep 17 00:00:00 2001
+From 3f7280192c69d6437c5d0e7c46ab2de345b52e5d Mon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Wed, 14 Jul 2010 19:07:34 +0530
-Subject: [PATCH 43/71] mt9v113: Settings from Aptima used to increase FPS
+Subject: [PATCH 43/75] mt9v113: Settings from Aptima used to increase FPS
The FPS is still low at around ~15FPS, expected one is 30FPS.
-From 9bff3b599cc43bb716d1f1190318122b169ab723 Mon Sep 17 00:00:00 2001
+From f33e1a25ca1d7e8418f076a9aead8fa66341f964 Mon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Thu, 15 Jul 2010 13:53:03 +0530
-Subject: [PATCH 44/71] mt9v113: AE param tuned to get 28~30FPS
+Subject: [PATCH 44/75] mt9v113: AE param tuned to get 28~30FPS
Please note that with this change we are compromising with
image quality, so should be used only in case of high FPS use-case.
-From 67792c04d84e341ce964c8c4fd5ddf2e6822ef3b Mon Sep 17 00:00:00 2001
+From c442dbd71313f119dce989b0b8d5ebaca9296863 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Mon, 12 Jul 2010 15:44:18 -0500
-Subject: [PATCH 45/71] omap3beagle: camera: Cleanup of boardfile
+Subject: [PATCH 45/75] omap3beagle: camera: Cleanup of boardfile
This removes a lot of dead code.
-From f976a2d7fc5b5e13a3445c668d5771605fee80c8 Mon Sep 17 00:00:00 2001
+From 240def7eda2939e944ab70726cdecf270865553d Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Mon, 12 Jul 2010 15:53:44 -0500
-Subject: [PATCH 46/71] omap3beagle: camera: Cleanup regulator usage
+Subject: [PATCH 46/75] omap3beagle: camera: Cleanup regulator usage
We were missing the point of regulator abstraction layer.
gpio_free(LEOPARD_RESET_GPIO);
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index d4b0b0a..b0da483 100644
+index 6835c1a..a1535ca 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -414,18 +414,14 @@ static struct platform_device beagle_cam_device = {
-From 7e836bcc19cd61006cbc8bc0eb3360b2c188fa47 Mon Sep 17 00:00:00 2001
+From 046dac666301c0df22679424169675045c70defd Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Mon, 12 Jul 2010 16:42:41 -0500
-Subject: [PATCH 47/71] omap3beagle: camera: Bring back mt9t111 support
+Subject: [PATCH 47/75] omap3beagle: camera: Bring back mt9t111 support
Restore MT9T111 sensor support.
{
cam_1v8_reg = regulator_get(&pdev->dev, "cam_1v8");
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index b0da483..0e7e8b2 100644
+index a1535ca..239bd44 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -77,6 +77,12 @@ static struct omap_opp * _omap37x_l3_rate_table = NULL;
-From 0652f5802a6ac2b741b0c23fffe9bedaaae968ab Mon Sep 17 00:00:00 2001
+From 682012ca5bc9b6e3dc2536736d3eedbad3598d64 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 15 Jul 2010 00:50:07 -0500
-Subject: [PATCH 48/71] REMOVE: v4l2: Delete MT9T111 sensor driver
+Subject: [PATCH 48/75] REMOVE: v4l2: Delete MT9T111 sensor driver
This removes MT9T111 support from the kernel.
-From f4746ba909482062d5c9ae03ac4b96b6de0c64c6 Mon Sep 17 00:00:00 2001
+From fab15f2df5c6ee2dc9fc5256d5c4330e6447dd3b Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Date: Fri, 11 Dec 2009 11:53:55 -0300
-Subject: [PATCH 49/71] V4L/DVB (13670): soc-camera: Add mt9t112 camera driver
+Subject: [PATCH 49/75] V4L/DVB (13670): soc-camera: Add mt9t112 camera driver
create mode 100644 drivers/media/video/mt9t112.c
create mode 100644 include/media/mt9t112.h
-From c56b16bf7ee83b17d6aefa30f84fb50417fde28b Mon Sep 17 00:00:00 2001
+From c3080e6e6ea59efc7f7812951a9972229fcc5078 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Date: Tue, 2 Feb 2010 13:17:54 +0900
-Subject: [PATCH 50/71] soc-camera: mt9t112: modify exiting conditions from standby mode
+Subject: [PATCH 50/75] soc-camera: mt9t112: modify exiting conditions from standby mode
This polling is needed if camera is in standby mode, but current exiting
condition is inverted.
-From 8b94a264c58f26b5877a79fb86f55f70e54cd25a Mon Sep 17 00:00:00 2001
+From f4b417bf9b373e042f6cfb921bc67dd18d0a752f Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 1 Jul 2010 07:26:38 -0500
-Subject: [PATCH 51/71] mt9t112: Migrate from soc_camera to v4l2-int-device
+Subject: [PATCH 51/75] mt9t112: Migrate from soc_camera to v4l2-int-device
This is to use the driver with the old OMAP3 Camera-ISP platform.
-From 0c96e072dd20fbf998ec2bfe9d9002994ec595fa Mon Sep 17 00:00:00 2001
+From 4e0c0d1ec79c097bb2e580f186a89963b9e35d8c Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 1 Jul 2010 07:33:49 -0500
-Subject: [PATCH 52/71] mt9t112: Add more info to public header
+Subject: [PATCH 52/75] mt9t112: Add more info to public header
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From fe7df74595c449a47a7a86cab9d35ab7320faf16 Mon Sep 17 00:00:00 2001
+From 8ef0425ef8bc0d228e03666cf7d0af564882fcef Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 1 Jul 2010 09:12:37 -0500
-Subject: [PATCH 53/71] mt9t112: Fix null pointer kernel bug
+Subject: [PATCH 53/75] mt9t112: Fix null pointer kernel bug
We were trying to access a null pointer (info) which we weren't
initializing anywhere.
-From d42fdae2330c191e3f06bd692650cc944c60e3eb Mon Sep 17 00:00:00 2001
+From b5eb720c7424a1018fd7b76b7bfb3a1e720ab77b Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 15 Jul 2010 00:55:43 -0500
-Subject: [PATCH 54/71] DEBUG: omap3beagle: Add MT9T112 to defconfig
+Subject: [PATCH 54/75] DEBUG: omap3beagle: Add MT9T112 to defconfig
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From f7b09cb5f7037445ccd5b3b0062d5d6f56164b58 Mon Sep 17 00:00:00 2001
+From ecf53d3104b6b73b1b32a9a5b39af2f258d74f8d Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 15 Jul 2010 15:47:23 -0500
-Subject: [PATCH 55/71] omap3beagle: camera: Change MT9T111 references to new MT9T112 driver
+Subject: [PATCH 55/75] omap3beagle: camera: Change MT9T111 references to new MT9T112 driver
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
static int beagle_cam_probe(struct platform_device *pdev)
{
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 0e7e8b2..7c9e40a 100644
+index 239bd44..f93616b 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -77,10 +77,10 @@ static struct omap_opp * _omap37x_l3_rate_table = NULL;
-From d1b23a6a7e9c92877c21a1325c699176e1e0be8f Mon Sep 17 00:00:00 2001
+From bfca10fcff055b53728881c4c443f18e1387c722 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 1 Jul 2010 13:57:26 -0500
-Subject: [PATCH 56/71] omap34xxcam: Fix multi pixel format negotiation
+Subject: [PATCH 56/75] omap34xxcam: Fix multi pixel format negotiation
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 1f47f621038372fe698921b5469dadf5446f73a8 Mon Sep 17 00:00:00 2001
+From 42caf665931e5f86e514fcf5e011daff395836c2 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 15 Jul 2010 17:53:07 -0500
-Subject: [PATCH 57/71] SQUASH: omap3beagle: camera: Bring back mt9t111 support
+Subject: [PATCH 57/75] SQUASH: omap3beagle: camera: Bring back mt9t111 support
---
arch/arm/mach-omap2/board-omap3beagle-camera.c | 8 ++++----
-From b62a517b3a1600fa491840223feb11fc99a76e0f Mon Sep 17 00:00:00 2001
+From a9afe5db3c54dc9dcc1025d493afe854a6e86914 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 15 Jul 2010 17:53:44 -0500
-Subject: [PATCH 58/71] mt9t112: Do init_camera every powerup
+Subject: [PATCH 58/75] mt9t112: Do init_camera every powerup
This is because we want to ensure we always come from a known state.
-From bb29d0713a991471b0d1a7cbb5194fc8e6a41ddb Mon Sep 17 00:00:00 2001
+From 86ecf1214056406f84852a9863b2e0f4cd64c52c Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 15 Jul 2010 18:15:32 -0500
-Subject: [PATCH 59/71] omap3beagle: camera: Switch flag for no sensor ISP
+Subject: [PATCH 59/75] omap3beagle: camera: Switch flag for no sensor ISP
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From cb36a121a4a73d6c9080f6648258317abb787f4c Mon Sep 17 00:00:00 2001
+From 022aa1373b5bfb77bc90f9e1abb485e0717f28c2 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 15 Jul 2010 18:33:00 -0500
-Subject: [PATCH 60/71] mt9t112: Add back 3MP basesize
+Subject: [PATCH 60/75] mt9t112: Add back 3MP basesize
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 5c6d1392f4781e7b86bb0335461ef2fda0349fdf Mon Sep 17 00:00:00 2001
+From aabf8386a23795f73722bf74901bd8aa46ebe1ba Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 15 Jul 2010 23:41:32 -0500
-Subject: [PATCH 61/71] mt9t112: Prepare for 24MHz EXTCLK and 30 fps
+Subject: [PATCH 61/75] mt9t112: Prepare for 24MHz EXTCLK and 30 fps
Set Aptina recommended values to get 30 FPS with VGA, which
are achievable given the new PLL divider settings, considering
-From b16f10756ac1aeeab5c636fcaa2837b2ffec43f2 Mon Sep 17 00:00:00 2001
+From 00cd18c8b6bd6b7f6c627d2b1284ca8f98f1fda4 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 15 Jul 2010 23:43:20 -0500
-Subject: [PATCH 62/71] omap3beagle: camera: Prepare 24MHz xclk for mt9t112
+Subject: [PATCH 62/75] omap3beagle: camera: Prepare 24MHz xclk for mt9t112
Adjust calculations of timings based on # of EXTCLK cycles.
-From 78cb5d13faa2b29e33c6a820435dbd82ad3effa5 Mon Sep 17 00:00:00 2001
+From 898d1ae2cad72e2b74a0a354b323ba91f2cd4a2a Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 16 Jul 2010 07:52:06 -0500
-Subject: [PATCH 63/71] mt9t112: Correct register settings for mt9t111 sensor
+Subject: [PATCH 63/75] mt9t112: Correct register settings for mt9t111 sensor
This now matches with Aptina's recommended values.
-From 50c7b176efb764ff4f4e3d5e847cd44396d692dc Mon Sep 17 00:00:00 2001
+From f6b91f473fe590e80eff6fd16e6fbcc15ce12b9a Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 16 Jul 2010 17:09:10 -0500
-Subject: [PATCH 64/71] mt9t112: Remove "smart" size selection
+Subject: [PATCH 64/75] mt9t112: Remove "smart" size selection
This code is broken, as it doesn't really adjust all other
settings, but output size to desired size. It isn't really
-From aa46956935fdee7636a66b023c521643c982208c Mon Sep 17 00:00:00 2001
+From 088fc53bfda23acd009213c5ff83f411bf09e307 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sun, 18 Jul 2010 11:25:12 +0200
-Subject: [PATCH 65/71] rtl8192su: remove bogus Kconfig depend on PCI and add another product ID
+Subject: [PATCH 65/75] rtl8192su: remove bogus Kconfig depend on PCI and add another product ID
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
-From d53224070b960f08989a50f1786adeecfca227eb Mon Sep 17 00:00:00 2001
+From c085125afaa6641b5db8e88f227eb4141ed6d59c Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Sun, 18 Jul 2010 01:12:41 -0500
-Subject: [PATCH 66/71] mt9t112: Add Context selection to configuration
+Subject: [PATCH 66/75] mt9t112: Add Context selection to configuration
Thsi makes always start at least with preview mode
(context A), and then, if needed, transition to capture
-From d098c75d211e3affc0a67ac98edce6494521faad Mon Sep 17 00:00:00 2001
+From 4fd52aac9743364e805cb3b4d1c9e8cb53a434a5 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Sun, 18 Jul 2010 01:45:29 -0500
-Subject: [PATCH 67/71] mt9t112: Disable JPEG in Context B
+Subject: [PATCH 67/75] mt9t112: Disable JPEG in Context B
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From 49fbfdfd756f126edc16fe04c55ce238e22815fc Mon Sep 17 00:00:00 2001
+From c8f30b77094542bca32a3c900e6afc4d9d4d7a74 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Sun, 18 Jul 2010 01:47:41 -0500
-Subject: [PATCH 68/71] mt9t112: Make context B stream unlimited frames
+Subject: [PATCH 68/75] mt9t112: Make context B stream unlimited frames
Context A does this by default, so, only context B needs
to be configured like this.
-From fd5fc55fe4ffedb3bf865f54b2648f77bcf0aa2e Mon Sep 17 00:00:00 2001
+From 9c37d9acd3f7909cb1f4e437e0b5fe31dd6214d6 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Mon, 19 Jul 2010 12:31:47 -0500
-Subject: [PATCH 69/71] mt9t112: Fix pll p-dividers abstraction
+Subject: [PATCH 69/75] mt9t112: Fix pll p-dividers abstraction
Previously, it wasn't clear that the values needed to be filled
were (val - 1). Fix that.
-From e1df34acacf936ec2d8f2822fed88d78d29449ad Mon Sep 17 00:00:00 2001
+From 3768ad7fb5304b05ee2184ba929a9896a3f8212a Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Mon, 19 Jul 2010 17:30:29 -0500
-Subject: [PATCH 70/71] mt9t112: Adjust 50/60Hz flickering settings
+Subject: [PATCH 70/75] mt9t112: Adjust 50/60Hz flickering settings
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From afb4dbf5c3633692ca5cdc052ec1c7c473a8020b Mon Sep 17 00:00:00 2001
+From a807b9f107bdcfbc9ba54ee4e67960f2e9912912 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Mon, 19 Jul 2010 17:45:38 -0500
-Subject: [PATCH 71/71] mt9t112: Trigger autofocus at the end of context switch
+Subject: [PATCH 71/75] mt9t112: Trigger autofocus at the end of context switch
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
-From b5412a27380f0c8d571181ba2ab719574fce796a Mon Sep 17 00:00:00 2001
+From 4ceb51197a0f0f2ebd9fc9530033f38de289a1cf Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 22 Jul 2010 11:03:33 -0500
-Subject: [PATCH 2/3] omap3beagle: camera: Fix dual sensor registration
+Subject: [PATCH 72/75] omap3beagle: camera: Fix dual sensor registration
dev_index should be different, which represents an internal index
in the master camera driver.
-From ff2a80a1bef6f7215221812eab381f4303fffce8 Mon Sep 17 00:00:00 2001
+From ac6564db6442fe40c974f233750c2fdd20735006 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 22 Jul 2010 13:29:16 -0500
-Subject: [PATCH 3/3] mt9v113: Fix State variable handling
+Subject: [PATCH 73/75] mt9v113: Fix State variable handling
State variable was misused, and was running detection all the
time the sensor was powered back on.
-From f3fdd3fb4e45b75722d68e5e380c0c71f83fffcf Mon Sep 17 00:00:00 2001
+From cf2b4381eeb1bb33c60fa48ea7ba27de13bca5ab Mon Sep 17 00:00:00 2001
From: Steve Kipisz <s-kipisz2@ti.com>
Date: Thu, 5 Aug 2010 10:51:11 -0500
-Subject: [PATCH] Move sensor rest to after applying power.
+Subject: [PATCH 74/75] Move sensor rest to after applying power.
---
arch/arm/mach-omap2/board-omap3beagle-camera.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c
-index 520e1d8..39ac4b7 100644
+index c0218e3..110c2c9 100644
--- a/arch/arm/mach-omap2/board-omap3beagle-camera.c
+++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c
@@ -160,8 +160,6 @@ static int mt9v113_power_set(struct v4l2_int_device *s, enum v4l2_power power)
-From c14444442ebdb0c717931557bebbeab314e44bf3 Mon Sep 17 00:00:00 2001
+From b23565171bddf4f2e454f7857d52a5a79da00ba7 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 22 Jul 2010 15:38:43 -0500
-Subject: [PATCH 1/2] omap3beagle: Add camera bootarg
+Subject: [PATCH 75/75] omap3beagle: Add camera bootarg
This adds a new 'camera' bootarg, with (so far) 2 new possible types:
- lbcmvga: Leopard Board Camera Module: MT9V113 VGA
MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
/* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */
--
-1.6.3.3
+1.6.6.1
+++ /dev/null
-From 908b7949544571e9acc1fe0cce918f6e338926c9 Mon Sep 17 00:00:00 2001
-From: Ranjith Lohithakshan <ranjithl@ti.com>
-Date: Fri, 28 May 2010 15:13:18 +0530
-Subject: [PATCH 1/9] OMAP3: SDRC: add 100MHz timing data for Hynix H8KDS0UN0MER-4EM
-
-Also, the refresh control value used at 200MHz was incorrect. Fixed
-that as well.
-
-Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com>
----
- arch/arm/mach-omap2/sdram-hynix-h8kds0un0mer-4em.h | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/sdram-hynix-h8kds0un0mer-4em.h b/arch/arm/mach-omap2/sdram-hynix-h8kds0un0mer-4em.h
-index 06433e6..c147586 100644
---- a/arch/arm/mach-omap2/sdram-hynix-h8kds0un0mer-4em.h
-+++ b/arch/arm/mach-omap2/sdram-hynix-h8kds0un0mer-4em.h
-@@ -19,10 +19,17 @@ static struct omap_sdrc_params h8kds0un0mer4em_sdrc_params[] = {
- .rate = 200000000,
- .actim_ctrla = 0x92e1c4c6,
- .actim_ctrlb = 0x0002111c,
-- .rfr_ctrl = 0x0004dc01,
-+ .rfr_ctrl = 0x0005e601,
- .mr = 0x00000032,
- },
- [1] = {
-+ .rate = 100000000,
-+ .actim_ctrla = 0x49912283,
-+ .actim_ctrlb = 0x0002110e,
-+ .rfr_ctrl = 0x0002da01,
-+ .mr = 0x00000032,
-+ },
-+ [2] = {
- .rate = 0
- },
- };
---
-1.6.2.4
-
+++ /dev/null
-From d247a112a9ffbad1057a2c8bede5727940ac2045 Mon Sep 17 00:00:00 2001
-From: Ranjith Lohithakshan <ranjithl@ti.com>
-Date: Fri, 28 May 2010 15:20:32 +0530
-Subject: [PATCH 2/9] omap3: Fix voltage and frequency scaling order when changing OPP via mpurate
-
-When lowering an OPP via mpurate from what is being set by bootloader,
-the frequency need to be lowered before voltage is ramped down. The
-current code was not taking this into consideration and was always
-adjusting the voltage before the frequency adjustments.
-
-This was leading to crashes on 3730 when mpurate was set to 300MHz
-because the voltage was lowered before the frequency.
-
-This patch fixes these issues by tracking the direction of OPP change
-and doing the voltage and frequency change in the right order.
-
-Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com>
----
- arch/arm/mach-omap2/clock34xx.c | 51 +++++++++++++++++++++++-------------
- arch/arm/mach-omap2/smartreflex.c | 11 +++++---
- 2 files changed, 39 insertions(+), 23 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
-index 2bb7182..dd408eb 100644
---- a/arch/arm/mach-omap2/clock34xx.c
-+++ b/arch/arm/mach-omap2/clock34xx.c
-@@ -65,6 +65,7 @@ struct clk *sdrc_ick_p, *arm_fck_p;
- */
- unsigned int vdd1_opp = 0;
- unsigned int vdd2_opp = 0;
-+bool vdd_scale_down = false;
-
- /**
- * omap3430es2_clk_ssi_find_idlest - return CM_IDLEST info for SSI
-@@ -429,6 +430,24 @@ static void __init omap2_clk_iva_init_to_idle(void)
-
- }
-
-+static u16 get_opp(struct omap_opp *opp_freq_table,
-+ unsigned long freq)
-+{
-+ struct omap_opp *prcm_config;
-+
-+ prcm_config = opp_freq_table;
-+
-+ if (prcm_config->rate <= freq)
-+ return prcm_config->opp_id; /* Return the Highest OPP */
-+ for (; prcm_config->rate; prcm_config--)
-+ if (prcm_config->rate < freq)
-+ return (prcm_config+1)->opp_id;
-+ else if (prcm_config->rate == freq)
-+ return prcm_config->opp_id;
-+ /* Return the least OPP */
-+ return (prcm_config+1)->opp_id;
-+}
-+
- /* REVISIT: Move this init stuff out into clock.c */
-
- /*
-@@ -444,8 +463,10 @@ static void __init omap2_clk_iva_init_to_idle(void)
- */
- static int __init omap2_clk_arch_init(void)
- {
-- struct omap_opp *opp_table;
-- short valid=0, err=0, i;
-+ short err=0;
-+ u16 current_vdd1_opp;
-+ struct clk *arm_fck;
-+ unsigned long current_mpu_rate;
-
- if (!mpurate)
- return -EINVAL;
-@@ -463,6 +484,10 @@ static int __init omap2_clk_arch_init(void)
- if (WARN((!l3_opps), "OPP table not defined for L3\n"))
- err = 1;
-
-+ arm_fck = clk_get(NULL, "arm_fck");
-+ if (WARN(IS_ERR(arm_fck), "Failed to get arm_fck.\n"))
-+ err = 1;
-+
- if (err)
- return -ENOENT;
-
-@@ -475,24 +500,12 @@ static int __init omap2_clk_arch_init(void)
- pr_err("This silicon doesn't support 720MHz\n");
- }
-
-- /*
-- * Select VDD1 OPP corresponding to mpurate
-- */
-- opp_table = mpu_opps;
--
-- for (i = 1; opp_table[i].opp_id <= get_max_vdd1(); i++) {
-- if (opp_table[i].rate == mpurate) {
-- valid = 1;
-- break;
-- }
-- }
-+ current_mpu_rate = clk_get_rate(arm_fck);
-+ current_vdd1_opp = get_opp(mpu_opps + get_max_vdd1(), current_mpu_rate);
-+ vdd1_opp = get_opp(mpu_opps + get_max_vdd1(), mpurate);
-
-- if (valid) {
-- vdd1_opp = opp_table[i].opp_id;
-- } else {
-- pr_err("Invalid MPU rate (%u)\n", mpurate);
-- return -EINVAL;
-- }
-+ if (vdd1_opp < current_vdd1_opp)
-+ vdd_scale_down = true;
-
- /*
- * Match lowest OPP setting for VDD1 with lowest OPP for VDD2 as well.
-diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
-index 3b6ddf8..fd34af2 100644
---- a/arch/arm/mach-omap2/smartreflex.c
-+++ b/arch/arm/mach-omap2/smartreflex.c
-@@ -48,6 +48,7 @@
- */
- extern unsigned int vdd1_opp;
- extern unsigned int vdd2_opp;
-+extern bool vdd_scale_down;
-
- extern int __init omap2_clk_set_freq(void);
-
-@@ -1082,6 +1083,10 @@ static int __init omap3_sr_init(void)
- sr_set_clk_length(&sr1);
- sr_set_clk_length(&sr2);
-
-+ /* For OPP scale down, scale down frequency before voltage */
-+ if (cpu_is_omap34xx() && vdd_scale_down)
-+ omap2_clk_set_freq();
-+
- /* Call the VPConfig, VCConfig, set N Values. */
- sr_set_nvalues(&sr1);
- sr_configure_vp(SR1);
-@@ -1089,10 +1094,8 @@ static int __init omap3_sr_init(void)
- sr_set_nvalues(&sr2);
- sr_configure_vp(SR2);
-
-- /*
-- * With voltages matching target OPP, set corresponding frequency.
-- */
-- if (cpu_is_omap34xx())
-+ /* For OPP scale up, scale up the frequency after voltage */
-+ if (cpu_is_omap34xx() && !vdd_scale_down)
- omap2_clk_set_freq();
-
- ret = sysfs_create_file(power_kobj, &sr_vdd1_autocomp.attr);
---
-1.6.2.4
-
+++ /dev/null
-From bf679a27766de623815d820431e1049326f7cac1 Mon Sep 17 00:00:00 2001
-From: Ranjith Lohithakshan <ranjithl@ti.com>
-Date: Fri, 9 Jul 2010 15:55:41 +0530
-Subject: [PATCH 3/9] OMAP3: PM: Introduce Smartreflex support on OMAP3630/DM3730
-
-OMAP3630 has a newer version of Smartreflex IP called Smartreflex2. There are
-new register additions and bit definition differences in this version of the IP.
-This patch introduces the Class3 driver support for Smartreflex2 on OMAP3630.
-
-Smartreflex2 has the following registers added
-IRQ_EOI, IRQSTATUS_RAW, IRQSTATUS, IRQENABLE_SET, IRQENABLE_CLR
-
-And following register offsets are different from Smartreflex1
-SENERROR, ERRCONFIG
-
-Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com>
----
- arch/arm/mach-omap2/smartreflex.c | 190 +++++++++++++++++++----------
- arch/arm/mach-omap2/smartreflex.h | 16 +++
- arch/arm/plat-omap/include/plat/control.h | 13 ++
- 3 files changed, 157 insertions(+), 62 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
-index fd34af2..fdd9540 100644
---- a/arch/arm/mach-omap2/smartreflex.c
-+++ b/arch/arm/mach-omap2/smartreflex.c
-@@ -99,18 +99,26 @@ static int sr_clk_enable(struct omap_sr *sr)
- return -1;
- }
-
-- /* set fclk- active , iclk- idle */
-- sr_modify_reg(sr, ERRCONFIG, SR_CLKACTIVITY_MASK,
-- SR_CLKACTIVITY_IOFF_FON);
-+ if (cpu_is_omap3630())
-+ sr_modify_reg(sr, ERRCONFIG_36XX, SR_IDLEMODE_MASK,
-+ SR_SMART_IDLE);
-+ else
-+ /* set fclk- active , iclk- idle */
-+ sr_modify_reg(sr, ERRCONFIG, SR_CLKACTIVITY_MASK,
-+ SR_CLKACTIVITY_IOFF_FON);
-
- return 0;
- }
-
- static void sr_clk_disable(struct omap_sr *sr)
- {
-- /* set fclk, iclk- idle */
-- sr_modify_reg(sr, ERRCONFIG, SR_CLKACTIVITY_MASK,
-- SR_CLKACTIVITY_IOFF_FOFF);
-+ if (cpu_is_omap3630())
-+ sr_modify_reg(sr, ERRCONFIG_36XX, SR_IDLEMODE_MASK,
-+ SR_FORCE_IDLE);
-+ else
-+ /* set fclk, iclk- idle */
-+ sr_modify_reg(sr, ERRCONFIG, SR_CLKACTIVITY_MASK,
-+ SR_CLKACTIVITY_IOFF_FOFF);
-
- clk_disable(sr->clk);
- sr->is_sr_reset = 1;
-@@ -285,39 +293,55 @@ static u32 swcalc_opp6_nvalue(void)
- static void sr_set_efuse_nvalues(struct omap_sr *sr)
- {
- if (sr->srid == SR1) {
-- sr->senn_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
-- OMAP343X_SR1_SENNENABLE_MASK) >>
-- OMAP343X_SR1_SENNENABLE_SHIFT;
-- sr->senp_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
-- OMAP343X_SR1_SENPENABLE_MASK) >>
-- OMAP343X_SR1_SENPENABLE_SHIFT;
--
-- sr->opp6_nvalue = swcalc_opp6_nvalue();
-- sr->opp5_nvalue = omap_ctrl_readl(
-- OMAP343X_CONTROL_FUSE_OPP5_VDD1);
-- sr->opp4_nvalue = omap_ctrl_readl(
-- OMAP343X_CONTROL_FUSE_OPP4_VDD1);
-- sr->opp3_nvalue = omap_ctrl_readl(
-- OMAP343X_CONTROL_FUSE_OPP3_VDD1);
-- sr->opp2_nvalue = omap_ctrl_readl(
-- OMAP343X_CONTROL_FUSE_OPP2_VDD1);
-- sr->opp1_nvalue = omap_ctrl_readl(
-- OMAP343X_CONTROL_FUSE_OPP1_VDD1);
-+ if (cpu_is_omap3630()) {
-+ sr->senn_mod = sr->senp_mod = 0x1;
-+
-+ sr->opp4_nvalue = omap_ctrl_readl(OMAP36XX_CONTROL_FUSE_OPP4_VDD1);
-+ sr->opp3_nvalue = omap_ctrl_readl(OMAP36XX_CONTROL_FUSE_OPP3_VDD1);
-+ sr->opp2_nvalue = omap_ctrl_readl(OMAP36XX_CONTROL_FUSE_OPP2_VDD1);
-+ sr->opp1_nvalue = omap_ctrl_readl(OMAP36XX_CONTROL_FUSE_OPP1_VDD1);
-+ } else {
-+ sr->senn_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
-+ OMAP343X_SR1_SENNENABLE_MASK) >>
-+ OMAP343X_SR1_SENNENABLE_SHIFT;
-+ sr->senp_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
-+ OMAP343X_SR1_SENPENABLE_MASK) >>
-+ OMAP343X_SR1_SENPENABLE_SHIFT;
-+
-+ sr->opp6_nvalue = swcalc_opp6_nvalue();
-+ sr->opp5_nvalue = omap_ctrl_readl(
-+ OMAP343X_CONTROL_FUSE_OPP5_VDD1);
-+ sr->opp4_nvalue = omap_ctrl_readl(
-+ OMAP343X_CONTROL_FUSE_OPP4_VDD1);
-+ sr->opp3_nvalue = omap_ctrl_readl(
-+ OMAP343X_CONTROL_FUSE_OPP3_VDD1);
-+ sr->opp2_nvalue = omap_ctrl_readl(
-+ OMAP343X_CONTROL_FUSE_OPP2_VDD1);
-+ sr->opp1_nvalue = omap_ctrl_readl(
-+ OMAP343X_CONTROL_FUSE_OPP1_VDD1);
-+ }
- } else if (sr->srid == SR2) {
-- sr->senn_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
-- OMAP343X_SR2_SENNENABLE_MASK) >>
-- OMAP343X_SR2_SENNENABLE_SHIFT;
--
-- sr->senp_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
-- OMAP343X_SR2_SENPENABLE_MASK) >>
-- OMAP343X_SR2_SENPENABLE_SHIFT;
--
-- sr->opp3_nvalue = omap_ctrl_readl(
-- OMAP343X_CONTROL_FUSE_OPP3_VDD2);
-- sr->opp2_nvalue = omap_ctrl_readl(
-- OMAP343X_CONTROL_FUSE_OPP2_VDD2);
-- sr->opp1_nvalue = omap_ctrl_readl(
-- OMAP343X_CONTROL_FUSE_OPP1_VDD2);
-+ if (cpu_is_omap3630()) {
-+ sr->senn_mod = sr->senp_mod = 0x1;
-+
-+ sr->opp1_nvalue = omap_ctrl_readl(OMAP36XX_CONTROL_FUSE_OPP1_VDD2);
-+ sr->opp2_nvalue = omap_ctrl_readl(OMAP36XX_CONTROL_FUSE_OPP2_VDD2);
-+ } else {
-+ sr->senn_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
-+ OMAP343X_SR2_SENNENABLE_MASK) >>
-+ OMAP343X_SR2_SENNENABLE_SHIFT;
-+
-+ sr->senp_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
-+ OMAP343X_SR2_SENPENABLE_MASK) >>
-+ OMAP343X_SR2_SENPENABLE_SHIFT;
-+
-+ sr->opp3_nvalue = omap_ctrl_readl(
-+ OMAP343X_CONTROL_FUSE_OPP3_VDD2);
-+ sr->opp2_nvalue = omap_ctrl_readl(
-+ OMAP343X_CONTROL_FUSE_OPP2_VDD2);
-+ sr->opp1_nvalue = omap_ctrl_readl(
-+ OMAP343X_CONTROL_FUSE_OPP1_VDD2);
-+ }
- }
- }
-
-@@ -325,22 +349,42 @@ static void sr_set_efuse_nvalues(struct omap_sr *sr)
- static void sr_set_testing_nvalues(struct omap_sr *sr)
- {
- if (sr->srid == SR1) {
-- sr->senp_mod = 0x03; /* SenN-M5 enabled */
-- sr->senn_mod = 0x03;
--
-- /* calculate nvalues for each opp */
-- sr->opp5_nvalue = cal_test_nvalue(0xacd + 0x330, 0x848 + 0x330);
-- sr->opp4_nvalue = cal_test_nvalue(0x964 + 0x2a0, 0x727 + 0x2a0);
-- sr->opp3_nvalue = cal_test_nvalue(0x85b + 0x200, 0x655 + 0x200);
-- sr->opp2_nvalue = cal_test_nvalue(0x506 + 0x1a0, 0x3be + 0x1a0);
-- sr->opp1_nvalue = cal_test_nvalue(0x373 + 0x100, 0x28c + 0x100);
-+ if (cpu_is_omap3630()) {
-+ sr->senp_mod = 0x1;
-+ sr->senn_mod = 0x1;
-+
-+ /* calculate nvalues for each opp */
-+ sr->opp1_nvalue = cal_test_nvalue(581, 489);
-+ sr->opp2_nvalue = cal_test_nvalue(1072, 910);
-+ sr->opp3_nvalue = cal_test_nvalue(1405, 1200);
-+ sr->opp4_nvalue = cal_test_nvalue(1842, 1580);
-+ sr->opp5_nvalue = cal_test_nvalue(1842, 1580);
-+ } else {
-+ sr->senp_mod = 0x03; /* SenN-M5 enabled */
-+ sr->senn_mod = 0x03;
-+
-+ /* calculate nvalues for each opp */
-+ sr->opp5_nvalue = cal_test_nvalue(0xacd + 0x330, 0x848 + 0x330);
-+ sr->opp4_nvalue = cal_test_nvalue(0x964 + 0x2a0, 0x727 + 0x2a0);
-+ sr->opp3_nvalue = cal_test_nvalue(0x85b + 0x200, 0x655 + 0x200);
-+ sr->opp2_nvalue = cal_test_nvalue(0x506 + 0x1a0, 0x3be + 0x1a0);
-+ sr->opp1_nvalue = cal_test_nvalue(0x373 + 0x100, 0x28c + 0x100);
-+ }
- } else if (sr->srid == SR2) {
-- sr->senp_mod = 0x03;
-- sr->senn_mod = 0x03;
--
-- sr->opp3_nvalue = cal_test_nvalue(0x76f + 0x200, 0x579 + 0x200);
-- sr->opp2_nvalue = cal_test_nvalue(0x4f5 + 0x1c0, 0x390 + 0x1c0);
-- sr->opp1_nvalue = cal_test_nvalue(0x359, 0x25d);
-+ if (cpu_is_omap3630()) {
-+ sr->senp_mod = 0x1;
-+ sr->senn_mod = 0x1;
-+
-+ sr->opp1_nvalue = cal_test_nvalue(556, 468);
-+ sr->opp2_nvalue = cal_test_nvalue(1099, 933);
-+ } else {
-+ sr->senp_mod = 0x03;
-+ sr->senn_mod = 0x03;
-+
-+ sr->opp3_nvalue = cal_test_nvalue(0x76f + 0x200, 0x579 + 0x200);
-+ sr->opp2_nvalue = cal_test_nvalue(0x4f5 + 0x1c0, 0x390 + 0x1c0);
-+ sr->opp1_nvalue = cal_test_nvalue(0x359, 0x25d);
-+ }
- }
-
- }
-@@ -487,6 +531,17 @@ static void sr_configure(struct omap_sr *sr)
- {
- u32 sr_config;
- u32 senp_en , senn_en;
-+ u32 senp_en_shift, senn_en_shift, err_config;
-+
-+ if (cpu_is_omap3630()) {
-+ senp_en_shift = SRCONFIG_SENPENABLE_SHIFT_36XX;
-+ senn_en_shift = SRCONFIG_SENNENABLE_SHIFT_36XX;
-+ err_config = ERRCONFIG_36XX;
-+ } else {
-+ senp_en_shift = SRCONFIG_SENPENABLE_SHIFT;
-+ senn_en_shift = SRCONFIG_SENNENABLE_SHIFT;
-+ err_config = ERRCONFIG;
-+ }
-
- if (sr->clk_length == 0)
- sr_set_clk_length(sr);
-@@ -498,15 +553,15 @@ static void sr_configure(struct omap_sr *sr)
- (sr->clk_length << SRCONFIG_SRCLKLENGTH_SHIFT) |
- SRCONFIG_SENENABLE | SRCONFIG_ERRGEN_EN |
- SRCONFIG_MINMAXAVG_EN |
-- (senn_en << SRCONFIG_SENNENABLE_SHIFT) |
-- (senp_en << SRCONFIG_SENPENABLE_SHIFT) |
-+ (senn_en << senn_en_shift) |
-+ (senp_en << senp_en_shift) |
- SRCONFIG_DELAYCTRL;
-
- sr_write_reg(sr, SRCONFIG, sr_config);
- sr_write_reg(sr, AVGWEIGHT, SR1_AVGWEIGHT_SENPAVGWEIGHT |
- SR1_AVGWEIGHT_SENNAVGWEIGHT);
-
-- sr_modify_reg(sr, ERRCONFIG, (SR_ERRWEIGHT_MASK |
-+ sr_modify_reg(sr, err_config, (SR_ERRWEIGHT_MASK |
- SR_ERRMAXLIMIT_MASK | SR_ERRMINLIMIT_MASK),
- (SR1_ERRWEIGHT | SR1_ERRMAXLIMIT | SR1_ERRMINLIMIT));
-
-@@ -515,14 +570,14 @@ static void sr_configure(struct omap_sr *sr)
- (sr->clk_length << SRCONFIG_SRCLKLENGTH_SHIFT) |
- SRCONFIG_SENENABLE | SRCONFIG_ERRGEN_EN |
- SRCONFIG_MINMAXAVG_EN |
-- (senn_en << SRCONFIG_SENNENABLE_SHIFT) |
-- (senp_en << SRCONFIG_SENPENABLE_SHIFT) |
-+ (senn_en << senn_en_shift) |
-+ (senp_en << senp_en_shift) |
- SRCONFIG_DELAYCTRL;
-
- sr_write_reg(sr, SRCONFIG, sr_config);
- sr_write_reg(sr, AVGWEIGHT, SR2_AVGWEIGHT_SENPAVGWEIGHT |
- SR2_AVGWEIGHT_SENNAVGWEIGHT);
-- sr_modify_reg(sr, ERRCONFIG, (SR_ERRWEIGHT_MASK |
-+ sr_modify_reg(sr, err_config, (SR_ERRWEIGHT_MASK |
- SR_ERRMAXLIMIT_MASK | SR_ERRMINLIMIT_MASK),
- (SR2_ERRWEIGHT | SR2_ERRMAXLIMIT | SR2_ERRMINLIMIT));
-
-@@ -604,6 +659,7 @@ static int sr_reset_voltage(int srid)
- static int sr_enable(struct omap_sr *sr, u32 target_opp_no)
- {
- u32 nvalue_reciprocal, v;
-+ u32 inten, intst, err_config;
-
- if (!(mpu_opps && l3_opps)) {
- pr_notice("VSEL values not found\n");
-@@ -662,9 +718,19 @@ static int sr_enable(struct omap_sr *sr, u32 target_opp_no)
- sr_write_reg(sr, NVALUERECIPROCAL, nvalue_reciprocal);
-
- /* Enable the interrupt */
-- sr_modify_reg(sr, ERRCONFIG,
-- (ERRCONFIG_VPBOUNDINTEN | ERRCONFIG_VPBOUNDINTST),
-- (ERRCONFIG_VPBOUNDINTEN | ERRCONFIG_VPBOUNDINTST));
-+ if (cpu_is_omap3630()) {
-+ inten = ERRCONFIG_VPBOUNDINTEN_36XX;
-+ intst = ERRCONFIG_VPBOUNDINTST_36XX;
-+ err_config = ERRCONFIG_36XX;
-+ } else {
-+ inten = ERRCONFIG_VPBOUNDINTEN;
-+ intst = ERRCONFIG_VPBOUNDINTST;
-+ err_config = ERRCONFIG;
-+ }
-+
-+ sr_modify_reg(sr, err_config,
-+ (inten | intst),
-+ (inten | intst));
-
- if (sr->srid == SR1) {
- /* set/latch init voltage */
-diff --git a/arch/arm/mach-omap2/smartreflex.h b/arch/arm/mach-omap2/smartreflex.h
-index 2a0e823..f20406b 100644
---- a/arch/arm/mach-omap2/smartreflex.h
-+++ b/arch/arm/mach-omap2/smartreflex.h
-@@ -30,6 +30,9 @@
- #define SENERROR 0x20
- #define ERRCONFIG 0x24
-
-+#define SENERROR_36XX 0x34
-+#define ERRCONFIG_36XX 0x38
-+
- /* SR Modules */
- #define SR1 1
- #define SR2 2
-@@ -106,6 +109,9 @@
- #define SRCONFIG_SENNENABLE_SHIFT 5
- #define SRCONFIG_SENPENABLE_SHIFT 3
-
-+#define SRCONFIG_SENNENABLE_SHIFT_36XX 1
-+#define SRCONFIG_SENPENABLE_SHIFT_36XX 0
-+
- #define SRCONFIG_SRENABLE BIT(11)
- #define SRCONFIG_SENENABLE BIT(10)
- #define SRCONFIG_ERRGEN_EN BIT(9)
-@@ -136,9 +142,19 @@
- #define SR_CLKACTIVITY_IOFF_FOFF (0x00 << 20)
- #define SR_CLKACTIVITY_IOFF_FON (0x02 << 20)
-
-+/* IDLEMODE SETTINGS for OMAP3630 */
-+#define SR_IDLEMODE_MASK (0x3 << 24)
-+#define SR_FORCE_IDLE 0x0
-+#define SR_NO_IDLE 0x1
-+#define SR_SMART_IDLE 0x2
-+#define SR_SMART_IDLE_WKUP 0x3
-+
- #define ERRCONFIG_VPBOUNDINTEN BIT(31)
- #define ERRCONFIG_VPBOUNDINTST BIT(30)
-
-+#define ERRCONFIG_VPBOUNDINTEN_36XX BIT(23)
-+#define ERRCONFIG_VPBOUNDINTST_36XX BIT(22)
-+
- #define SR1_ERRWEIGHT (0x07 << 16)
- #define SR1_ERRMAXLIMIT (0x02 << 8)
- #define SR1_ERRMINLIMIT (0xFA << 0)
-diff --git a/arch/arm/plat-omap/include/plat/control.h b/arch/arm/plat-omap/include/plat/control.h
-index 20f5c98..68100d6 100644
---- a/arch/arm/plat-omap/include/plat/control.h
-+++ b/arch/arm/plat-omap/include/plat/control.h
-@@ -283,6 +283,19 @@
- #define OMAP343X_SCRATCHPAD (OMAP343X_CTRL_BASE + 0x910)
- #define OMAP343X_SCRATCHPAD_ROM_OFFSET 0x19C
-
-+/* OMAP36XX CONTROL FUSE */
-+
-+#define OMAP36XX_CONTROL_FUSE_OPP1_VDD1 (OMAP2_CONTROL_GENERAL + 0x0114)
-+#define OMAP36XX_CONTROL_FUSE_OPP2_VDD1 (OMAP2_CONTROL_GENERAL + 0x0118)
-+#define OMAP36XX_CONTROL_FUSE_OPP3_VDD1 (OMAP2_CONTROL_GENERAL + 0x0120)
-+#define OMAP36XX_CONTROL_FUSE_OPP4_VDD1 (OMAP2_CONTROL_GENERAL + 0x0110)
-+#define OMAP36XX_CONTROL_FUSE_OPP5_VDD1 (OMAP2_CONTROL_GENERAL + 0x0108)
-+
-+#define OMAP36XX_CONTROL_FUSE_OPP1_VDD2 (OMAP2_CONTROL_GENERAL + 0x0128)
-+#define OMAP36XX_CONTROL_FUSE_OPP2_VDD2 (OMAP2_CONTROL_GENERAL + 0x012c)
-+
-+#define OMAP36XX_CONTROL_FUSE_SR (OMAP2_CONTROL_GENERAL + 0x0130)
-+
- /*
- * Product ID register
- */
---
-1.6.2.4
-
+++ /dev/null
-From 8d78b8198d220d5ebade7587caf664a0ef8c8fe7 Mon Sep 17 00:00:00 2001
-From: Ranjith Lohithakshan <ranjithl@ti.com>
-Date: Mon, 12 Jul 2010 16:25:14 +0530
-Subject: [PATCH 4/9] OMAP3630: PM: implement Foward Body-Bias for OPP1G
-
-Introduces voltscale_adaptive_body_bias function to voltage.c.
-voltscale_adaptive_body_bias is called by omap_voltage_scale after a
-voltage transition has occured. Currently voltscale_adaptive_body_bias
-only implements Forward Body-Bias (FBB) for OMAP3630 when MPU runs at
-1GHz or higher. In the future Reverse Body-Bias might be included.
-
-FBB is an Adaptive Body-Bias technique to boost performance for weak
-process devices at high OPPs. This results in voltage boost on the VDD1
-PMOS back gates when running at maximum OPP. Current recommendations
-are to enable FBB on all 3630 regardless of silicon characteristics and
-EFUSE values.
-
-ABB applies to all OMAP family of devices based on 45nm process,
-which includes OMAP3630, OMAP4, TI816x and TI814x.
-
-Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com>
----
- arch/arm/mach-omap2/prm-regbits-34xx.h | 18 +++++
- arch/arm/mach-omap2/prm.h | 4 +
- arch/arm/mach-omap2/smartreflex.c | 130 ++++++++++++++++++++++++++++++++
- 3 files changed, 152 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h
-index 0066693..8dee7e0 100644
---- a/arch/arm/mach-omap2/prm-regbits-34xx.h
-+++ b/arch/arm/mach-omap2/prm-regbits-34xx.h
-@@ -212,6 +212,8 @@
- /* PRM_SYSCONFIG specific bits */
-
- /* PRM_IRQSTATUS_MPU specific bits */
-+#define OMAP3630_ABB_LDO_TRANXDONE_ST_SHIFT 26
-+#define OMAP3630_ABB_LDO_TRANXDONE_ST (1 << 26)
- #define OMAP3430ES2_SND_PERIPH_DPLL_ST_SHIFT 25
- #define OMAP3430ES2_SND_PERIPH_DPLL_ST (1 << 25)
- #define OMAP3430_VC_TIMEOUTERR_ST (1 << 24)
-@@ -581,6 +583,22 @@
-
- /* PRM_VP2_STATUS specific bits */
-
-+/* PRM_LDO_ABB_SETUP specific bits */
-+#define OMAP3630_SR2_IN_TRANSITION (1 << 6)
-+#define OMAP3630_SR2_STATUS_SHIFT 3
-+#define OMAP3630_SR2_STATUS_MASK (3 << 3)
-+#define OMAP3630_OPP_CHANGE (1 << 2)
-+#define OMAP3630_OPP_SEL_SHIFT 0
-+#define OMAP3630_OPP_SEL_MASK (3 << 0)
-+
-+/* PRM_LDO_ABB_CTRL specific bits */
-+#define OMAP3630_SR2_WTCNT_VALUE_SHIFT 8
-+#define OMAP3630_SR2_WTCNT_VALUE_MASK (0xff << 8)
-+#define OMAP3630_SLEEP_RBB_SEL (1 << 3)
-+#define OMAP3630_ACTIVE_FBB_SEL (1 << 2)
-+#define OMAP3630_ACTIVE_RBB_SEL (1 << 1)
-+#define OMAP3630_SR2EN (1 << 0)
-+
- /* RM_RSTST_NEON specific bits */
-
- /* PM_WKDEP_NEON specific bits */
-diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h
-index ea050ce..b7f95d7 100644
---- a/arch/arm/mach-omap2/prm.h
-+++ b/arch/arm/mach-omap2/prm.h
-@@ -158,6 +158,10 @@
- #define OMAP3430_PRM_VP2_VOLTAGE OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00e0)
- #define OMAP3_PRM_VP2_STATUS_OFFSET 0x00e4
- #define OMAP3430_PRM_VP2_STATUS OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00e4)
-+#define OMAP3_PRM_LDO_ABB_SETUP_OFFSET 0X00f0
-+#define OMAP3630_PRM_LDO_ABB_SETUP OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0X00f0)
-+#define OMAP3_PRM_LDO_ABB_CTRL_OFFSET 0X00f4
-+#define OMAP3630_PRM_LDO_ABB_CTRL OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0X00f4)
-
- #define OMAP3_PRM_CLKSEL_OFFSET 0x0040
- #define OMAP3430_PRM_CLKSEL OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, 0x0040)
-diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
-index fdd9540..d7c8a04 100644
---- a/arch/arm/mach-omap2/smartreflex.c
-+++ b/arch/arm/mach-omap2/smartreflex.c
-@@ -42,6 +42,11 @@
- #define SWCALC_OPP6_DELTA_NNT 379
- #define SWCALC_OPP6_DELTA_PNT 227
-
-+#define ABB_MAX_SETTLING_TIME 30
-+
-+#define ABB_FAST_OPP 1
-+#define ABB_NOMINAL_OPP 2
-+#define ABB_SLOW_OPP 3
-
- /*
- * VDD1 and VDD2 OPPs derived from the bootarg 'mpurate'
-@@ -397,6 +402,126 @@ static void sr_set_nvalues(struct omap_sr *sr)
- sr_set_efuse_nvalues(sr);
- }
-
-+/**
-+ * sr_voltagescale_adaptive_body_bias - controls ABB ldo during voltage scaling
-+ * @target_volt: target voltage determines if ABB ldo is active or bypassed
-+ *
-+ * Adaptive Body-Bias is a technique in all OMAP silicon that uses the 45nm
-+ * process. ABB can boost voltage in high OPPs for silicon with weak
-+ * characteristics (forward Body-Bias) as well as lower voltage in low OPPs
-+ * for silicon with strong characteristics (Reverse Body-Bias).
-+ *
-+ * Only Foward Body-Bias for operating at high OPPs is implemented below, per
-+ * recommendations from silicon team.
-+ * Reverse Body-Bias for saving power in active cases and sleep cases is not
-+ * yet implemented.
-+ */
-+static int sr_voltagescale_adaptive_body_bias(u32 target_opp_no)
-+{
-+ u32 sr2en_enabled;
-+ int timeout;
-+ int sr2_wtcnt_value;
-+ struct clk *sys_ck;
-+
-+ sys_ck = clk_get(NULL, "sys_ck");
-+ if (IS_ERR(sys_ck)) {
-+ pr_warning("%s: Could not get the sys clk to calculate"
-+ "SR2_WTCNT_VALUE \n", __func__);
-+ return -ENOENT;
-+ }
-+
-+ /* calculate SR2_WTCNT_VALUE settling time */
-+ sr2_wtcnt_value = (ABB_MAX_SETTLING_TIME *
-+ (clk_get_rate(sys_ck) / 1000000) / 8);
-+
-+ clk_put(sys_ck);
-+
-+ /* has SR2EN been enabled previously? */
-+ sr2en_enabled = (prm_read_mod_reg(OMAP3430_GR_MOD,
-+ OMAP3_PRM_LDO_ABB_CTRL_OFFSET) &
-+ OMAP3630_SR2EN);
-+
-+ /* select fast, nominal or slow OPP for ABB ldo */
-+ if (target_opp_no >= VDD1_OPP4) {
-+ /* program for fast opp - enable FBB */
-+ prm_rmw_mod_reg_bits(OMAP3630_OPP_SEL_MASK,
-+ (ABB_FAST_OPP << OMAP3630_OPP_SEL_SHIFT),
-+ OMAP3430_GR_MOD,
-+ OMAP3_PRM_LDO_ABB_SETUP_OFFSET);
-+
-+ /* enable the ABB ldo if not done already */
-+ if (!sr2en_enabled)
-+ prm_set_mod_reg_bits(OMAP3630_SR2EN,
-+ OMAP3430_GR_MOD,
-+ OMAP3_PRM_LDO_ABB_CTRL_OFFSET);
-+ } else if (sr2en_enabled) {
-+ /* program for nominal opp - bypass ABB ldo */
-+ prm_rmw_mod_reg_bits(OMAP3630_OPP_SEL_MASK,
-+ (ABB_NOMINAL_OPP << OMAP3630_OPP_SEL_SHIFT),
-+ OMAP3430_GR_MOD,
-+ OMAP3_PRM_LDO_ABB_SETUP_OFFSET);
-+ } else {
-+ /* nothing to do here yet... might enable RBB here someday */
-+ return 0;
-+ }
-+
-+ /* set ACTIVE_FBB_SEL for all 45nm silicon */
-+ prm_set_mod_reg_bits(OMAP3630_ACTIVE_FBB_SEL,
-+ OMAP3430_GR_MOD,
-+ OMAP3_PRM_LDO_ABB_CTRL_OFFSET);
-+
-+ /* program settling time of 30us for ABB ldo transition */
-+ prm_rmw_mod_reg_bits(OMAP3630_SR2_WTCNT_VALUE_MASK,
-+ (sr2_wtcnt_value << OMAP3630_SR2_WTCNT_VALUE_SHIFT),
-+ OMAP3430_GR_MOD,
-+ OMAP3_PRM_LDO_ABB_CTRL_OFFSET);
-+
-+ /* clear ABB ldo interrupt status */
-+ prm_write_mod_reg(OMAP3630_ABB_LDO_TRANXDONE_ST,
-+ OCP_MOD,
-+ OMAP2_PRCM_IRQSTATUS_MPU_OFFSET);
-+
-+ /* enable ABB LDO OPP change */
-+ prm_set_mod_reg_bits(OMAP3630_OPP_CHANGE,
-+ OMAP3430_GR_MOD,
-+ OMAP3_PRM_LDO_ABB_SETUP_OFFSET);
-+
-+ timeout = 0;
-+
-+ /* wait until OPP change completes */
-+ while ((timeout < ABB_MAX_SETTLING_TIME ) &&
-+ (!(prm_read_mod_reg(OCP_MOD,
-+ OMAP2_PRCM_IRQSTATUS_MPU_OFFSET) &
-+ OMAP3630_ABB_LDO_TRANXDONE_ST))) {
-+ udelay(1);
-+ timeout++;
-+ }
-+
-+ if (timeout == ABB_MAX_SETTLING_TIME)
-+ pr_debug("ABB: TRANXDONE timed out waiting for OPP change\n");
-+
-+ timeout = 0;
-+
-+ /* Clear all pending TRANXDONE interrupts/status */
-+ while (timeout < ABB_MAX_SETTLING_TIME) {
-+ prm_write_mod_reg(OMAP3630_ABB_LDO_TRANXDONE_ST,
-+ OCP_MOD,
-+ OMAP2_PRCM_IRQSTATUS_MPU_OFFSET);
-+ if (!(prm_read_mod_reg(OCP_MOD,
-+ OMAP2_PRCM_IRQSTATUS_MPU_OFFSET)
-+ & OMAP3630_ABB_LDO_TRANXDONE_ST))
-+ break;
-+
-+ udelay(1);
-+ timeout++;
-+ }
-+ if (timeout == ABB_MAX_SETTLING_TIME)
-+ pr_debug("ABB: TRANXDONE timed out trying to clear status\n");
-+
-+ return 0;
-+}
-+
-+
- static void sr_configure_vp(int srid)
- {
- u32 vpconfig;
-@@ -462,6 +587,8 @@ static void sr_configure_vp(int srid)
- prm_clear_mod_reg_bits(OMAP3430_FORCEUPDATE, OMAP3430_GR_MOD,
- OMAP3_PRM_VP1_CONFIG_OFFSET);
-
-+ if(cpu_is_omap3630())
-+ sr_voltagescale_adaptive_body_bias(target_opp_no);
- } else if (srid == SR2) {
- if (vdd2_opp == 0)
- target_opp_no = get_vdd2_opp();
-@@ -1031,6 +1158,9 @@ int sr_voltagescale_vcbypass(u32 target_opp, u32 current_opp,
- t2_smps_delay = ((t2_smps_steps * 125) / 40) + 2;
- udelay(t2_smps_delay);
-
-+ if (cpu_is_omap3630() && (vdd == VDD1_OPP))
-+ sr_voltagescale_adaptive_body_bias(target_opp_no);
-+
- if (sr_status) {
- if (vdd == VDD1_OPP)
- sr_start_vddautocomap(SR1, target_opp_no);
---
-1.6.2.4
-
+++ /dev/null
-From a107c9c4bd642fd5044275ffcb00a8e20da481c7 Mon Sep 17 00:00:00 2001
-From: Vaibhav Hiremath <hvaibhav@ti.com>
-Date: Tue, 10 Aug 2010 20:05:51 +0530
-Subject: [PATCH 5/9] Revert "Revert "OMAP: DSS2: FIFI UNDERFLOW issue fixed""
-
-This reverts commit b2c74dc43741d8d824e5439f6a82c0a5aa5d1c80.
-
-There was small bug in the GFX UNDERFLOW patch, so I had reverted it and now
-since I have fix for the same so I am again commiting the fix which reverts the
-original patch with fix.
-
-Original commit - 4b58d194fd8f5a1c68803eb326e9a71621571696.
-Revert commit - b2c74dc43741d8d824e5439f6a82c0a5aa5d1c80
----
- drivers/video/omap2/omapfb/omapfb-main.c | 83 ++++++++++++++++++++----------
- 1 files changed, 55 insertions(+), 28 deletions(-)
-
-diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
-index ef29983..7f47a34 100644
---- a/drivers/video/omap2/omapfb/omapfb-main.c
-+++ b/drivers/video/omap2/omapfb/omapfb-main.c
-@@ -182,6 +182,11 @@ static unsigned omapfb_get_vrfb_offset(struct omapfb_info *ofbi, int rot)
- static u32 omapfb_get_region_rot_paddr(struct omapfb_info *ofbi, int rot)
- {
- if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-+ if (rot == FB_ROTATE_CW)
-+ rot = FB_ROTATE_CCW;
-+ else if (rot == FB_ROTATE_CCW)
-+ rot = FB_ROTATE_CW;
-+
- return ofbi->region.vrfb.paddr[rot]
- + omapfb_get_vrfb_offset(ofbi, rot);
- } else {
-@@ -189,20 +194,32 @@ static u32 omapfb_get_region_rot_paddr(struct omapfb_info *ofbi, int rot)
- }
- }
-
--static u32 omapfb_get_region_paddr(struct omapfb_info *ofbi)
-+static u32 omapfb_get_region_paddr(struct omapfb_info *ofbi, int rot)
- {
-- if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
-- return ofbi->region.vrfb.paddr[0];
-- else
-+ if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-+ if (rot == FB_ROTATE_CW)
-+ rot = FB_ROTATE_CCW;
-+ else if (rot == FB_ROTATE_CCW)
-+ rot = FB_ROTATE_CW;
-+
-+ return ofbi->region.vrfb.paddr[rot];
-+ } else {
- return ofbi->region.paddr;
-+ }
- }
-
--static void __iomem *omapfb_get_region_vaddr(struct omapfb_info *ofbi)
-+static void __iomem *omapfb_get_region_vaddr(struct omapfb_info *ofbi, int rot)
- {
-- if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
-- return ofbi->region.vrfb.vaddr[0];
-- else
-+ if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-+ if (rot == FB_ROTATE_CW)
-+ rot = FB_ROTATE_CCW;
-+ else if (rot == FB_ROTATE_CCW)
-+ rot = FB_ROTATE_CW;
-+
-+ return ofbi->region.vrfb.vaddr[rot];
-+ } else {
- return ofbi->region.vaddr;
-+ }
- }
-
- static struct omapfb_colormode omapfb_colormodes[] = {
-@@ -501,7 +518,7 @@ static int setup_vrfb_rotation(struct fb_info *fbi)
- unsigned bytespp;
- bool yuv_mode;
- enum omap_color_mode mode;
-- int r;
-+ int r, rotation = var->rotate;
- bool reconf;
-
- if (!rg->size || ofbi->rotation_type != OMAP_DSS_ROT_VRFB)
-@@ -509,6 +526,11 @@ static int setup_vrfb_rotation(struct fb_info *fbi)
-
- DBG("setup_vrfb_rotation\n");
-
-+ if (rotation == FB_ROTATE_CW)
-+ rotation = FB_ROTATE_CCW;
-+ else if (rotation == FB_ROTATE_CCW)
-+ rotation = FB_ROTATE_CW;
-+
- r = fb_mode_to_dss_mode(var, &mode);
- if (r)
- return r;
-@@ -532,32 +554,35 @@ static int setup_vrfb_rotation(struct fb_info *fbi)
- vrfb->yres != var->yres_virtual)
- reconf = true;
-
-- if (vrfb->vaddr[0] && reconf) {
-+ if (vrfb->vaddr[rotation] && reconf) {
- fbi->screen_base = NULL;
- fix->smem_start = 0;
- fix->smem_len = 0;
-- iounmap(vrfb->vaddr[0]);
-- vrfb->vaddr[0] = NULL;
-+ iounmap(vrfb->vaddr[rotation]);
-+ vrfb->vaddr[rotation] = NULL;
- DBG("setup_vrfb_rotation: reset fb\n");
- }
-
-- if (vrfb->vaddr[0])
-+ if (vrfb->vaddr[rotation])
- return 0;
-
-- omap_vrfb_setup(&rg->vrfb, rg->paddr,
-- var->xres_virtual,
-- var->yres_virtual,
-- bytespp, yuv_mode);
-+ if (rotation == FB_ROTATE_CW || rotation == FB_ROTATE_CCW)
-+ omap_vrfb_setup(&rg->vrfb, rg->paddr,
-+ var->yres_virtual, var->xres_virtual,
-+ bytespp, yuv_mode);
-+ else
-+ omap_vrfb_setup(&rg->vrfb, rg->paddr,
-+ var->xres_virtual, var->yres_virtual,
-+ bytespp, yuv_mode);
-
-- /* Now one can ioremap the 0 angle view */
-- r = omap_vrfb_map_angle(vrfb, var->yres_virtual, 0);
-+ /* Now one can ioremap the rotation angle view */
-+ r = omap_vrfb_map_angle(vrfb, var->yres_virtual, rotation);
- if (r)
- return r;
--
- /* used by open/write in fbmem.c */
-- fbi->screen_base = ofbi->region.vrfb.vaddr[0];
-+ fbi->screen_base = ofbi->region.vrfb.vaddr[rotation];
-
-- fix->smem_start = ofbi->region.vrfb.paddr[0];
-+ fix->smem_start = ofbi->region.vrfb.paddr[rotation];
-
- switch (var->nonstd) {
- case OMAPFB_COLOR_YUV422:
-@@ -601,7 +626,8 @@ void set_fb_fix(struct fb_info *fbi)
- DBG("set_fb_fix\n");
-
- /* used by open/write in fbmem.c */
-- fbi->screen_base = (char __iomem *)omapfb_get_region_vaddr(ofbi);
-+ fbi->screen_base = (char __iomem *)omapfb_get_region_vaddr(ofbi,
-+ var->rotate);
-
- /* used by mmap in fbmem.c */
- if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-@@ -624,7 +650,7 @@ void set_fb_fix(struct fb_info *fbi)
- fix->smem_len = rg->size;
- }
-
-- fix->smem_start = omapfb_get_region_paddr(ofbi);
-+ fix->smem_start = omapfb_get_region_paddr(ofbi, var->rotate);
-
- fix->type = FB_TYPE_PACKED_PIXELS;
-
-@@ -860,11 +886,11 @@ static int omapfb_setup_overlay(struct fb_info *fbi, struct omap_overlay *ovl,
-
-
- if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-- data_start_p = omapfb_get_region_rot_paddr(ofbi, rotation);
-+ data_start_p = omapfb_get_region_rot_paddr(ofbi, 0);
- data_start_v = NULL;
- } else {
-- data_start_p = omapfb_get_region_paddr(ofbi);
-- data_start_v = omapfb_get_region_vaddr(ofbi);
-+ data_start_p = omapfb_get_region_paddr(ofbi, 0);
-+ data_start_v = omapfb_get_region_vaddr(ofbi, 0);
- }
-
- if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
-@@ -1076,6 +1102,7 @@ static struct vm_operations_struct mmap_user_ops = {
- static int omapfb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
- {
- struct omapfb_info *ofbi = FB2OFB(fbi);
-+ struct fb_var_screeninfo *var = &fbi->var;
- struct fb_fix_screeninfo *fix = &fbi->fix;
- unsigned long off;
- unsigned long start;
-@@ -1087,7 +1114,7 @@ static int omapfb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
- return -EINVAL;
- off = vma->vm_pgoff << PAGE_SHIFT;
-
-- start = omapfb_get_region_paddr(ofbi);
-+ start = omapfb_get_region_paddr(ofbi, var->rotate);
- len = fix->smem_len;
- if (off >= len)
- return -EINVAL;
---
-1.6.2.4
-
+++ /dev/null
-From 412656ce83a2605119dc1a7bc5492a13240dc666 Mon Sep 17 00:00:00 2001
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Sat, 19 Dec 2009 14:43:01 +0000
-Subject: [PATCH 6/9] modules: Skip empty sections when exporting section notes
-
-Commit 35dead4 "modules: don't export section names of empty sections
-via sysfs" changed the set of sections that have attributes, but did
-not change the iteration over these attributes in add_notes_attrs().
-This can lead to add_notes_attrs() creating attributes with the wrong
-names or with null name pointers.
-
-Introduce a sect_empty() function and use it in both add_sect_attrs()
-and add_notes_attrs().
-
-Reported-by: Martin Michlmayr <tbm@cyrius.com>
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-Tested-by: Martin Michlmayr <tbm@cyrius.com>
-Cc: stable@kernel.org
-Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sanjeev Premi <premi@ti.com>
----
- kernel/module.c | 17 ++++++++++-------
- 1 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/kernel/module.c b/kernel/module.c
-index 12afc5a..a1b4a43 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -996,6 +996,12 @@ static const struct kernel_symbol *resolve_symbol(Elf_Shdr *sechdrs,
- * J. Corbet <corbet@lwn.net>
- */
- #if defined(CONFIG_KALLSYMS) && defined(CONFIG_SYSFS)
-+
-+static inline bool sect_empty(const Elf_Shdr *sect)
-+{
-+ return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
-+}
-+
- struct module_sect_attr
- {
- struct module_attribute mattr;
-@@ -1037,8 +1043,7 @@ static void add_sect_attrs(struct module *mod, unsigned int nsect,
-
- /* Count loaded sections and allocate structures */
- for (i = 0; i < nsect; i++)
-- if (sechdrs[i].sh_flags & SHF_ALLOC
-- && sechdrs[i].sh_size)
-+ if (!sect_empty(&sechdrs[i]))
- nloaded++;
- size[0] = ALIGN(sizeof(*sect_attrs)
- + nloaded * sizeof(sect_attrs->attrs[0]),
-@@ -1056,9 +1061,7 @@ static void add_sect_attrs(struct module *mod, unsigned int nsect,
- sattr = §_attrs->attrs[0];
- gattr = §_attrs->grp.attrs[0];
- for (i = 0; i < nsect; i++) {
-- if (! (sechdrs[i].sh_flags & SHF_ALLOC))
-- continue;
-- if (!sechdrs[i].sh_size)
-+ if (sect_empty(&sechdrs[i]))
- continue;
- sattr->address = sechdrs[i].sh_addr;
- sattr->name = kstrdup(secstrings + sechdrs[i].sh_name,
-@@ -1142,7 +1145,7 @@ static void add_notes_attrs(struct module *mod, unsigned int nsect,
- /* Count notes sections and allocate structures. */
- notes = 0;
- for (i = 0; i < nsect; i++)
-- if ((sechdrs[i].sh_flags & SHF_ALLOC) &&
-+ if (!sect_empty(&sechdrs[i]) &&
- (sechdrs[i].sh_type == SHT_NOTE))
- ++notes;
-
-@@ -1158,7 +1161,7 @@ static void add_notes_attrs(struct module *mod, unsigned int nsect,
- notes_attrs->notes = notes;
- nattr = ¬es_attrs->attrs[0];
- for (loaded = i = 0; i < nsect; ++i) {
-- if (!(sechdrs[i].sh_flags & SHF_ALLOC))
-+ if (sect_empty(&sechdrs[i]))
- continue;
- if (sechdrs[i].sh_type == SHT_NOTE) {
- nattr->attr.name = mod->sect_attrs->attrs[loaded].name;
---
-1.6.2.4
-
+++ /dev/null
-From 243e09d50e7a03eb9fc8e7313784f2ed96602890 Mon Sep 17 00:00:00 2001
-From: Vaibhav Hiremath <hvaibhav@ti.com>
-Date: Fri, 13 Aug 2010 19:23:23 +0530
-Subject: [PATCH 7/9] RTC:s35390a:Bug Fix: Pie mode doesn't work
-
-Due to some race condition between Work and ISR, somehow interrupt
-is not getting enabled and because of this RTC interrupt was not working.
----
- drivers/rtc/rtc-s35390a.c | 21 ++++++++++-----------
- 1 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/rtc/rtc-s35390a.c b/drivers/rtc/rtc-s35390a.c
-index de597c1..b30a57c 100644
---- a/drivers/rtc/rtc-s35390a.c
-+++ b/drivers/rtc/rtc-s35390a.c
-@@ -230,11 +230,15 @@ static int s35390a_freq_irq_enable(struct i2c_client *client, unsigned enabled)
- return err;
- }
-
-- buf[0] = s35390a->rtc->irq_freq;
-- /* This chip expects the bits of each byte to be in reverse order */
-- buf[0] = bitrev8(buf[0]);
-+ if (enabled) {
-+ buf[0] = s35390a->rtc->irq_freq;
-
-- return s35390a_set_reg(s35390a, S35390A_CMD_INT1_REG1, buf, sizeof(buf));
-+ buf[0] = bitrev8(buf[0]);
-+ err = s35390a_set_reg(s35390a, S35390A_CMD_INT1_REG1, buf,
-+ sizeof(buf));
-+ }
-+
-+ return err;
- }
-
- static int s35390a_rtc_freq_irq_enable(struct device *dev, int enabled)
-@@ -419,20 +423,14 @@ static void s35390a_work(struct work_struct *work)
- /* Notify RTC core on event */
- rtc_update_irq(s35390a->rtc, 1, RTC_IRQF | RTC_AF);
- s35390a_alarm_irq_enable(client, 0);
-- enable_irq(client->irq);
- } else if (buf[0] & BIT(0)) {
- /* Notify RTC core on event */
- rtc_update_irq(s35390a->rtc, 1, RTC_PF | RTC_IRQF);
-- s35390a_freq_irq_enable(client, 0);
-- enable_irq(client->irq);
-- s35390a_freq_irq_enable(client, 1);
- } else if (buf[0] & BIT(1)) {
- /* Notify RTC core on event */
- rtc_update_irq(s35390a->rtc, 1, RTC_UF | RTC_IRQF);
-- s35390a_update_irq_enable(client, 0);
-- enable_irq(client->irq);
-- s35390a_update_irq_enable(client, 1);
- }
-+ enable_irq(client->irq);
- out:
- return;
- }
-@@ -559,6 +557,7 @@ static int s35390a_probe(struct i2c_client *client,
- }
- s35390a->rtc->irq_freq = 0;
- s35390a->rtc->max_user_freq = 16;
-+
- return 0;
-
- exit_intr:
---
-1.6.2.4
-
+++ /dev/null
-From ba573a248dc8c33ff21fc4efbfea0ca85cdbc5d0 Mon Sep 17 00:00:00 2001
-From: Ranjith Lohithakshan <ranjithl@ti.com>
-Date: Tue, 7 Sep 2010 10:05:11 +0530
-Subject: [PATCH 8/9] OMAP3EVM: Set minimum throughput requirement for DSS
-
-GFX_FIFO_UNDERFLOW has been observed when the L3 rate is lowered
-below 100MHz or so. Once this underflow happens the display stops
-working.
-
-This patch puts a minimum bus throughput requirement when lcd, tv
-or dvi displays are enabled. The throughput is calculated in such
-a manner that it will translate into a minimum L3 rate of 100MHz.
-
-Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com>
----
- arch/arm/mach-omap2/board-omap3evm.c | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
-index eb7ad1c..710a25d 100644
---- a/arch/arm/mach-omap2/board-omap3evm.c
-+++ b/arch/arm/mach-omap2/board-omap3evm.c
-@@ -422,12 +422,15 @@ static int omap3_evm_enable_lcd(struct omap_dss_device *dssdev)
- else
- gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
-
-+ omap_pm_set_min_bus_tput(&dssdev->dev, OCP_INITIATOR_AGENT, 400000);
-+
- lcd_enabled = 1;
- return 0;
- }
-
- static void omap3_evm_disable_lcd(struct omap_dss_device *dssdev)
- {
-+ omap_pm_set_min_bus_tput(&dssdev->dev, OCP_INITIATOR_AGENT, 0);
- gpio_set_value(OMAP3EVM_LCD_PANEL_ENVDD, 1);
-
- if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2)
-@@ -449,11 +452,13 @@ static struct omap_dss_device omap3_evm_lcd_device = {
-
- static int omap3_evm_enable_tv(struct omap_dss_device *dssdev)
- {
-+ omap_pm_set_min_bus_tput(&dssdev->dev, OCP_INITIATOR_AGENT, 400000);
- return 0;
- }
-
- static void omap3_evm_disable_tv(struct omap_dss_device *dssdev)
- {
-+ omap_pm_set_min_bus_tput(&dssdev->dev, OCP_INITIATOR_AGENT, 0);
- }
-
- static struct omap_dss_device omap3_evm_tv_device = {
-@@ -488,12 +493,15 @@ static int omap3_evm_enable_dvi(struct omap_dss_device *dssdev)
- omap_mux_set_gpio(OMAP_MUX_MODE3, 3);
- }
-
-+ omap_pm_set_min_bus_tput(&dssdev->dev, OCP_INITIATOR_AGENT, 400000);
-+
- dvi_enabled = 1;
- return 0;
- }
-
- static void omap3_evm_disable_dvi(struct omap_dss_device *dssdev)
- {
-+ omap_pm_set_min_bus_tput(&dssdev->dev, OCP_INITIATOR_AGENT, 0);
- gpio_set_value(OMAP3EVM_DVI_PANEL_EN_GPIO, 0);
-
- dvi_enabled = 0;
---
-1.6.2.4
-
+++ /dev/null
-From 39bf598ec0579e3bfc55f9038eccaaa5e2755c70 Mon Sep 17 00:00:00 2001
-From: Ajay Kumar Gupta <ajay.gupta@ti.com>
-Date: Thu, 17 Jun 2010 13:58:46 +0530
-Subject: [PATCH 9/9] ehci: fix device detect issue with modules
-
-Currently devices don't get detected automatically if the ehci
-module is inserted 2nd time onward. We need to disconnect and
-reconnect the device for it to get detected and enumerated.
-
-Resetting the USB PHY after the EHCI controller has been initilized
-fixes this issue.
-
-Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
----
- drivers/usb/host/ehci-omap.c | 86 ++++++++++++++++++-----------------------
- 1 files changed, 38 insertions(+), 48 deletions(-)
-
-diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
-index 0f8fbf5..7d3a150 100644
---- a/drivers/usb/host/ehci-omap.c
-+++ b/drivers/usb/host/ehci-omap.c
-@@ -411,6 +411,31 @@ static void omap_usb_utmi_init(struct ehci_hcd_omap *omap, u8 tll_channel_mask)
-
- /*-------------------------------------------------------------------------*/
-
-+void ehci_omap_phy_reset(struct ehci_hcd_omap *omap)
-+{
-+ if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) &&
-+ gpio_is_valid(omap->reset_gpio_port[0])) {
-+ gpio_request(omap->reset_gpio_port[0], "HSUSB0 reset");
-+ gpio_direction_output(omap->reset_gpio_port[0], 0);
-+ }
-+
-+ if ((omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) &&
-+ gpio_is_valid(omap->reset_gpio_port[1])) {
-+ gpio_request(omap->reset_gpio_port[1], "HSUSB1 reset");
-+ gpio_direction_output(omap->reset_gpio_port[1], 0);
-+ }
-+
-+ /* Hold the PHY in RESET for enough time till DIR is high */
-+ udelay(10);
-+
-+ if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) &&
-+ gpio_is_valid(omap->reset_gpio_port[0]))
-+ gpio_set_value(omap->reset_gpio_port[0], 1);
-+ if ((omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) &&
-+ gpio_is_valid(omap->reset_gpio_port[1]))
-+ gpio_set_value(omap->reset_gpio_port[1], 1);
-+}
-+
- /* omap_start_ehc
- * - Start the TI USBHOST controller
- */
-@@ -445,24 +470,6 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
- }
- clk_enable(omap->usbhost1_48m_fck);
-
-- if (omap->phy_reset) {
-- /* Refer: ISSUE1 */
-- if (gpio_is_valid(omap->reset_gpio_port[0])) {
-- gpio_request(omap->reset_gpio_port[0],
-- "USB1 PHY reset");
-- gpio_direction_output(omap->reset_gpio_port[0], 0);
-- }
--
-- if (gpio_is_valid(omap->reset_gpio_port[1])) {
-- gpio_request(omap->reset_gpio_port[1],
-- "USB2 PHY reset");
-- gpio_direction_output(omap->reset_gpio_port[1], 0);
-- }
--
-- /* Hold the PHY in RESET for enough time till DIR is high */
-- udelay(10);
-- }
--
- /* Configure TLL for 60Mhz clk for ULPI */
- omap->usbtll_fck = clk_get(omap->dev, "usbtll_fck");
- if (IS_ERR(omap->usbtll_fck)) {
-@@ -576,20 +583,6 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
- omap_usb_utmi_init(omap, tll_ch_mask);
- }
-
-- if (omap->phy_reset) {
-- /* Refer ISSUE1:
-- * Hold the PHY in RESET for enough time till
-- * PHY is settled and ready
-- */
-- udelay(10);
--
-- if (gpio_is_valid(omap->reset_gpio_port[0]))
-- gpio_set_value(omap->reset_gpio_port[0], 1);
--
-- if (gpio_is_valid(omap->reset_gpio_port[1]))
-- gpio_set_value(omap->reset_gpio_port[1], 1);
-- }
--
- return 0;
-
- err_sys_status:
-@@ -604,14 +597,6 @@ err_tll_fck:
- clk_disable(omap->usbhost1_48m_fck);
- clk_put(omap->usbhost1_48m_fck);
-
-- if (omap->phy_reset) {
-- if (gpio_is_valid(omap->reset_gpio_port[0]))
-- gpio_free(omap->reset_gpio_port[0]);
--
-- if (gpio_is_valid(omap->reset_gpio_port[1]))
-- gpio_free(omap->reset_gpio_port[1]);
-- }
--
- err_host_48m_fck:
- clk_disable(omap->usbhost2_120m_fck);
- clk_put(omap->usbhost2_120m_fck);
-@@ -697,14 +682,6 @@ static void omap_stop_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
- omap->usbtll_ick = NULL;
- }
-
-- if (omap->phy_reset) {
-- if (gpio_is_valid(omap->reset_gpio_port[0]))
-- gpio_free(omap->reset_gpio_port[0]);
--
-- if (gpio_is_valid(omap->reset_gpio_port[1]))
-- gpio_free(omap->reset_gpio_port[1]);
-- }
--
- dev_dbg(omap->dev, "Clock to USB host has been disabled\n");
- }
-
-@@ -1033,6 +1010,10 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
- /* here we "know" root ports should always stay powered */
- ehci_port_power(omap->ehci, 1);
-
-+ /* reset the USB PHY */
-+ if (omap->phy_reset)
-+ ehci_omap_phy_reset(omap);
-+
- return 0;
-
- err_add_hcd:
-@@ -1083,6 +1064,15 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
-
- usb_remove_hcd(hcd);
- omap_stop_ehc(omap, hcd);
-+
-+ if (omap->phy_reset) {
-+ if (gpio_is_valid(omap->reset_gpio_port[0]))
-+ gpio_free(omap->reset_gpio_port[0]);
-+
-+ if (gpio_is_valid(omap->reset_gpio_port[1]))
-+ gpio_free(omap->reset_gpio_port[1]);
-+ }
-+
- iounmap(hcd->regs);
- for (i = 0 ; i < OMAP3_HS_USB_PORTS ; i++) {
- if (omap->regulator[i]) {
---
-1.6.2.4
-
COMPATIBLE_MACHINE = "beagleboard|omap3evm|am3517-evm|dm37x-evm|am37x-evm|omap3-touchbook|overo"
-# This is the v2.6.32_OMAPPSP_03.00.01.06 branch
-SRCREV = "a6bad4464f985fdd3bed72e1b82dcbfc004d7869"
+# This is on the master branch
+SRCREV = "5fc29e7b2a76a64a739f857858ef0b98294aa155"
# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
MACHINE_KERNEL_PR_append = "+gitr${SRCREV}"
-SRC_URI = "git://arago-project.org/git/people/sriram/ti-psp-omap.git;protocol=git;branch=master \
+SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;branch=master \
file://0001-Revert-omap3-beagle-Fix-compile-time-errors.patch \
file://0002-board-omap3touchbook-make-it-build-against-TI-linux-.patch \
file://0003-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch \
file://cam/0069-mt9t112-Fix-pll-p-dividers-abstraction.patch \
file://cam/0070-mt9t112-Adjust-50-60Hz-flickering-settings.patch \
file://cam/0071-mt9t112-Trigger-autofocus-at-the-end-of-context-swit.patch \
- file://cam/0002-omap3beagle-camera-Fix-dual-sensor-registration.patch \
- file://cam/0003-mt9v113-Fix-State-variable-handling.patch \
- file://cam/0001-Move-sensor-rest-to-after-applying-power.patch \
+ file://cam/0072-omap3beagle-camera-Fix-dual-sensor-registration.patch \
+ file://cam/0073-mt9v113-Fix-State-variable-handling.patch \
+ file://cam/0074-Move-sensor-rest-to-after-applying-power.patch \
+ file://cam/0075-omap3beagle-Add-camera-bootarg.patch \
file://0001-BeagleBoard-Adjust-USER-button-pin-for-xM.patch \
- file://cam/0001-omap3beagle-Add-camera-bootarg.patch \
file://porches.patch \
- file://pending/0001-OMAP3-SDRC-add-100MHz-timing-data-for-Hynix-H8KDS0.patch \
- file://pending/0002-omap3-Fix-voltage-and-frequency-scaling-order-when.patch \
- file://pending/0003-OMAP3-PM-Introduce-Smartreflex-support-on-OMAP3630.patch \
- file://pending/0004-OMAP3630-PM-implement-Foward-Body-Bias-for-OPP1G.patch \
- file://pending/0005-Revert-Revert-OMAP-DSS2-FIFI-UNDERFLOW-issue-fix.patch \
- file://pending/0006-modules-Skip-empty-sections-when-exporting-section.patch \
- file://pending/0007-RTC-s35390a-Bug-Fix-Pie-mode-doesn-t-work.patch \
- file://pending/0008-OMAP3EVM-Set-minimum-throughput-requirement-for-DSS.patch \
- file://pending/0009-ehci-fix-device-detect-issue-with-modules.patch \
file://defconfig"
SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
git.openpandora.org / openembedded.git / commitdiff