mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
linux-omap 2.6.39: refresh patchset
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 282243e365a651ca50d48d0a75a6f81163bc166e Mon Sep 17 00:00:00 2001
|
||||
From fc4833337f5386c40eaf41d533fb5fcbd38d6a1d Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Thu, 12 May 2011 07:59:52 -0500
|
||||
Subject: [PATCH 54/59] OMAP2+: cpufreq: free up table on exit
|
||||
Subject: [PATCH 1/6] OMAP2+: cpufreq: free up table on exit
|
||||
|
||||
freq_table allocated by opp_init_cpufreq_table in omap_cpu_init
|
||||
needs to be freed in omap_cpu_exit.
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 01bf169f5ffd47e37b702da4176f57e852441e08 Mon Sep 17 00:00:00 2001
|
||||
From bbd8caaeda861dfa69882c34d8556b541f822ae2 Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Thu, 12 May 2011 08:14:41 -0500
|
||||
Subject: [PATCH 55/59] OMAP2+: cpufreq: handle invalid cpufreq table
|
||||
Subject: [PATCH 2/6] OMAP2+: cpufreq: handle invalid cpufreq table
|
||||
|
||||
Handle the case when cpufreq_frequency_table_cpuinfo fails. freq_table
|
||||
that we passed failed the internal test of cpufreq generic driver,
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From a06384a5a4f2b5062b3dafea2d71726d59a49579 Mon Sep 17 00:00:00 2001
|
||||
From 47eeee58d9321e827e68ea3b914988db6b1635da Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Thu, 12 May 2011 16:27:45 -0700
|
||||
Subject: [PATCH 56/59] OMAP2+: cpufreq: minor comment cleanup
|
||||
Subject: [PATCH 3/6] OMAP2+: cpufreq: minor comment cleanup
|
||||
|
||||
this should probably get squashed in..
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 52731e770e5a2dfbeacb9d9a595f865c3b4f7186 Mon Sep 17 00:00:00 2001
|
||||
From d972d3f4eb53c261f8496176b429287b97e297d0 Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Fri, 13 May 2011 05:34:35 -0700
|
||||
Subject: [PATCH 57/59] OMAP2: cpufreq: use clk_init_cpufreq_table if OPPs not available
|
||||
Subject: [PATCH 4/6] OMAP2: cpufreq: use clk_init_cpufreq_table if OPPs not available
|
||||
|
||||
OMAP2 does not use OPP tables at the moment for DVFS. Currently,
|
||||
we depend on opp table initialization to give us the freq_table,
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 754ac343ca86dd2879f597a6ec21c16463aee5b3 Mon Sep 17 00:00:00 2001
|
||||
From dec271e2e15103120df35be942884f577d6a768c Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Fri, 13 May 2011 05:43:49 -0700
|
||||
Subject: [PATCH 58/59] OMAP2+: cpufreq: use cpufreq_frequency_table_target
|
||||
Subject: [PATCH 5/6] OMAP2+: cpufreq: use cpufreq_frequency_table_target
|
||||
|
||||
Use cpufreq_frequency_table_target for finding the proper target
|
||||
instead of seeing if the frequency requested is divisible alone.
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From cdc549d4ac9225025303a9a8395eb9aa8a73b355 Mon Sep 17 00:00:00 2001
|
||||
From d7559c9bd5225ad2e57e8c798dc1301396e05ce1 Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Wed, 18 May 2011 01:48:23 -0500
|
||||
Subject: [PATCH 59/59] OMAP2+: cpufreq: fix freq_table leak
|
||||
Subject: [PATCH 6/6] OMAP2+: cpufreq: fix freq_table leak
|
||||
|
||||
Since we have two cpus the cpuinit call for cpu1 causes
|
||||
freq_table of cpu0 to be overwritten. instead, we maintain
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 130c4f82c269aa0d4110d3e94c3737a14812314d Mon Sep 17 00:00:00 2001
|
||||
From b581872eacd6342a890b1c6d2596c16fac5875b5 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Turquette <mturquette@ti.com>
|
||||
Date: Tue, 17 May 2011 09:35:54 -0500
|
||||
Subject: [PATCH 52/59] cpufreq: helpers for walking the frequency table
|
||||
Subject: [PATCH 1/2] cpufreq: helpers for walking the frequency table
|
||||
|
||||
Two new functions for getting the next higher and next lower frequencies
|
||||
in the cpufreq table, based upon a frequency supplied in kHz.
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From e524139aca0c528627bad699d06ddcbc9f3fb374 Mon Sep 17 00:00:00 2001
|
||||
From 0faab5e374817718add80a132f6fc90943971a61 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Turquette <mturquette@ti.com>
|
||||
Date: Tue, 17 May 2011 09:43:09 -0500
|
||||
Subject: [PATCH 53/59] cpufreq: introduce hotplug governor
|
||||
Subject: [PATCH 2/2] cpufreq: introduce hotplug governor
|
||||
|
||||
The "hotplug" governor scales CPU frequency based on load, similar to
|
||||
"ondemand". It scales up to the highest frequency when "up_threshold"
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 48ec8ab4a64104f7ecc9dabb9e23e2c3d0d1feee Mon Sep 17 00:00:00 2001
|
||||
From a2564b1a8a946ddaf64930b48ec279b87bc758ca Mon Sep 17 00:00:00 2001
|
||||
From: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
|
||||
Date: Wed, 11 Aug 2010 17:02:43 -0700
|
||||
Subject: [PATCH 44/59] OMAP: CPUfreq: ensure driver initializes after cpufreq framework and governors
|
||||
Subject: [PATCH 1/8] OMAP: CPUfreq: ensure driver initializes after cpufreq framework and governors
|
||||
|
||||
Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 56cee7bf023af728c952f692f4c24822392882a1 Mon Sep 17 00:00:00 2001
|
||||
From cb564063772d73261a8dd24d9285a37e8db49cd4 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Hilman <khilman@deeprootsystems.com>
|
||||
Date: Wed, 11 Aug 2010 17:05:38 -0700
|
||||
Subject: [PATCH 45/59] OMAP: CPUfreq: ensure policy is fully initialized
|
||||
Subject: [PATCH 2/8] OMAP: CPUfreq: ensure policy is fully initialized
|
||||
|
||||
Ensure policy min/max/cur values are initialized when OMAP
|
||||
CPUfreq driver starts.
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From a5072bdf333b8fb1080aac5d2b986553ea8de0f9 Mon Sep 17 00:00:00 2001
|
||||
From 6702f624ad5c5e1eba57f9efe889f64333f9e022 Mon Sep 17 00:00:00 2001
|
||||
From: Rajendra Nayak <rnayak@ti.com>
|
||||
Date: Mon, 10 Nov 2008 17:00:25 +0530
|
||||
Subject: [PATCH 46/59] OMAP3 PM: CPUFreq driver for OMAP3
|
||||
Subject: [PATCH 3/8] OMAP3 PM: CPUFreq driver for OMAP3
|
||||
|
||||
CPUFreq driver for OMAP3
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 4b4c71142858947f540b337873caf5c1436b4d73 Mon Sep 17 00:00:00 2001
|
||||
From 71849b3531c66af5f925deb1deb60a3722d62463 Mon Sep 17 00:00:00 2001
|
||||
From: Silesh C V <silesh@ti.com>
|
||||
Date: Wed, 29 Sep 2010 14:52:54 +0530
|
||||
Subject: [PATCH 47/59] OMAP: PM: CPUFREQ: Fix conditional compilation
|
||||
Subject: [PATCH 4/8] OMAP: PM: CPUFREQ: Fix conditional compilation
|
||||
|
||||
Fix conditional compilation. A conditional expresiion
|
||||
should follow "#elif", in this case #elif clause should
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 6dac35adbd97f167ddbf26fd1bcea66d1e8a6c6f Mon Sep 17 00:00:00 2001
|
||||
From 6d6506387d617a934bc4f8476e8f06a11e21b043 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Hilman <khilman@deeprootsystems.com>
|
||||
Date: Tue, 16 Nov 2010 11:48:41 -0800
|
||||
Subject: [PATCH 48/59] cpufreq: fixup after new OPP layer merged
|
||||
Subject: [PATCH 5/8] cpufreq: fixup after new OPP layer merged
|
||||
|
||||
---
|
||||
arch/arm/plat-omap/cpu-omap.c | 3 ++-
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 989bfeaacfc9eb39762aefbfb5f25ecbd05892cc Mon Sep 17 00:00:00 2001
|
||||
From d93e9bf14c8b5194c0db64ae7daae80c228bfc04 Mon Sep 17 00:00:00 2001
|
||||
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
|
||||
Date: Mon, 14 Mar 2011 17:08:48 +0530
|
||||
Subject: [PATCH 49/59] OMAP: cpufreq: Split OMAP1 and OMAP2PLUS CPUfreq drivers.
|
||||
Subject: [PATCH 6/8] OMAP: cpufreq: Split OMAP1 and OMAP2PLUS CPUfreq drivers.
|
||||
|
||||
This patch is an attempt to cleanup the #ifdeferry in the
|
||||
omap CPUfreq drivers.
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From d1774fef215a30d5a5db713170f74cc8da82933f Mon Sep 17 00:00:00 2001
|
||||
From 1d829a2213997f903aacfffcf184e3705be38026 Mon Sep 17 00:00:00 2001
|
||||
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
|
||||
Date: Mon, 14 Mar 2011 17:08:49 +0530
|
||||
Subject: [PATCH 50/59] OMAP2PLUS: cpufreq: Add SMP support to cater OMAP4430
|
||||
Subject: [PATCH 7/8] OMAP2PLUS: cpufreq: Add SMP support to cater OMAP4430
|
||||
|
||||
On OMAP SMP configuartion, both processors share the voltage
|
||||
and clock. So both CPUs needs to be scaled together and hence
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From b25a843135dc8ba5053befd1d39ac2286a3d9fa4 Mon Sep 17 00:00:00 2001
|
||||
From a216121073a645a3b9965f06a0813d77b3f467ca Mon Sep 17 00:00:00 2001
|
||||
From: Jarkko Nikula <jhnikula@gmail.com>
|
||||
Date: Thu, 14 Apr 2011 16:21:58 +0300
|
||||
Subject: [PATCH 51/59] OMAP2PLUS: cpufreq: Fix typo when attempting to set mpu_clk for OMAP4
|
||||
Subject: [PATCH 8/8] OMAP2PLUS: cpufreq: Fix typo when attempting to set mpu_clk for OMAP4
|
||||
|
||||
Fix this typo as there is no dpll_mpu_ck for OMAP3 and code flow is clearly
|
||||
trying to set mpu_clk for OMAP4 for which this dpll_mpu_ck is available.
|
||||
-30
@@ -1,30 +0,0 @@
|
||||
From bbd4463bb8bfcbe9968a37caa368803b153718f3 Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Sat, 12 Feb 2011 17:27:14 +0530
|
||||
Subject: [PATCH 32/59] OMAP3+: voltage: remove spurious pr_notice for debugfs
|
||||
|
||||
cat of debugfs entry for vp_volt provides voltage. The additional pr_notice
|
||||
is just spam on console and provides no additional information.
|
||||
|
||||
Signed-off-by: Nishanth Menon <nm@ti.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/voltage.c | 1 -
|
||||
1 files changed, 0 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c
|
||||
index 0c1552d..9ef3789 100644
|
||||
--- a/arch/arm/mach-omap2/voltage.c
|
||||
+++ b/arch/arm/mach-omap2/voltage.c
|
||||
@@ -148,7 +148,6 @@ static int vp_volt_debug_get(void *data, u64 *val)
|
||||
}
|
||||
|
||||
vsel = vdd->read_reg(prm_mod_offs, vdd->vp_data->voltage);
|
||||
- pr_notice("curr_vsel = %x\n", vsel);
|
||||
|
||||
if (!vdd->pmic_info->vsel_to_uv) {
|
||||
pr_warning("PMIC function to convert vsel to voltage"
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-41
@@ -1,41 +0,0 @@
|
||||
From 111ad0be33804ba5a6173a0dda14ebe524271b4f Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Sun, 13 Mar 2011 09:07:23 +0530
|
||||
Subject: [PATCH 33/59] OMAP4: PM: remove redundant #ifdef CONFIG_PM
|
||||
|
||||
pm44xx.c is built only when CONFIG_PM is setup,
|
||||
remove redundant CONFIG_PM check.
|
||||
|
||||
This also fixes:
|
||||
https://bugzilla.kernel.org/show_bug.cgi?id=25022
|
||||
|
||||
Reported-by: Martin Etti <ettl.martin@gmx.de>
|
||||
|
||||
Signed-off-by: Nishanth Menon <nm@ti.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/pm44xx.c | 2 --
|
||||
1 files changed, 0 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
|
||||
index 76cfff2..59a870b 100644
|
||||
--- a/arch/arm/mach-omap2/pm44xx.c
|
||||
+++ b/arch/arm/mach-omap2/pm44xx.c
|
||||
@@ -105,13 +105,11 @@ static int __init omap4_pm_init(void)
|
||||
|
||||
pr_err("Power Management for TI OMAP4.\n");
|
||||
|
||||
-#ifdef CONFIG_PM
|
||||
ret = pwrdm_for_each(pwrdms_setup, NULL);
|
||||
if (ret) {
|
||||
pr_err("Failed to setup powerdomains\n");
|
||||
goto err2;
|
||||
}
|
||||
-#endif
|
||||
|
||||
#ifdef CONFIG_SUSPEND
|
||||
suspend_set_ops(&omap_pm_ops);
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-30
@@ -1,30 +0,0 @@
|
||||
From ef07d331b0b76889b19fa3de7b0300dc0bbc5366 Mon Sep 17 00:00:00 2001
|
||||
From: Aaro Koskinen <aaro.koskinen@nokia.com>
|
||||
Date: Thu, 24 Mar 2011 18:35:31 +0200
|
||||
Subject: [PATCH 34/59] OMAP3+: smartreflex: fix sr_late_init() error path in probe
|
||||
|
||||
sr_late_init() will take care of freeing the resources.
|
||||
|
||||
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/smartreflex.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
|
||||
index 13e24f9..dbc4b6f 100644
|
||||
--- a/arch/arm/mach-omap2/smartreflex.c
|
||||
+++ b/arch/arm/mach-omap2/smartreflex.c
|
||||
@@ -883,7 +883,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
|
||||
ret = sr_late_init(sr_info);
|
||||
if (ret) {
|
||||
pr_warning("%s: Error in SR late init\n", __func__);
|
||||
- goto err_release_region;
|
||||
+ return ret;
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-36
@@ -1,36 +0,0 @@
|
||||
From 2b5e2efb76a51a07721352afeeaddb249267042e Mon Sep 17 00:00:00 2001
|
||||
From: Aaro Koskinen <aaro.koskinen@nokia.com>
|
||||
Date: Thu, 24 Mar 2011 18:35:32 +0200
|
||||
Subject: [PATCH 35/59] OMAP3+: smartreflex: request the memory region
|
||||
|
||||
We are releasing the memory region, but never actually request it.
|
||||
|
||||
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/smartreflex.c | 8 ++++++++
|
||||
1 files changed, 8 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
|
||||
index dbc4b6f..703143a 100644
|
||||
--- a/arch/arm/mach-omap2/smartreflex.c
|
||||
+++ b/arch/arm/mach-omap2/smartreflex.c
|
||||
@@ -847,6 +847,14 @@ static int __init omap_sr_probe(struct platform_device *pdev)
|
||||
goto err_free_devinfo;
|
||||
}
|
||||
|
||||
+ mem = request_mem_region(mem->start, resource_size(mem),
|
||||
+ dev_name(&pdev->dev));
|
||||
+ if (!mem) {
|
||||
+ dev_err(&pdev->dev, "%s: no mem region\n", __func__);
|
||||
+ ret = -EBUSY;
|
||||
+ goto err_free_devinfo;
|
||||
+ }
|
||||
+
|
||||
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
||||
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-66
@@ -1,66 +0,0 @@
|
||||
From 1108cddc9f227ba5ded64c1c8141ce9147a4902d Mon Sep 17 00:00:00 2001
|
||||
From: Aaro Koskinen <aaro.koskinen@nokia.com>
|
||||
Date: Thu, 24 Mar 2011 18:35:33 +0200
|
||||
Subject: [PATCH 36/59] OMAP3+: smartreflex: fix ioremap leak on probe error
|
||||
|
||||
Add missing iounmap() to error paths.
|
||||
|
||||
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/smartreflex.c | 10 ++++++----
|
||||
1 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
|
||||
index 703143a..156807e 100644
|
||||
--- a/arch/arm/mach-omap2/smartreflex.c
|
||||
+++ b/arch/arm/mach-omap2/smartreflex.c
|
||||
@@ -904,7 +904,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
|
||||
vdd_dbg_dir = omap_voltage_get_dbgdir(sr_info->voltdm);
|
||||
if (!vdd_dbg_dir) {
|
||||
ret = -EINVAL;
|
||||
- goto err_release_region;
|
||||
+ goto err_iounmap;
|
||||
}
|
||||
|
||||
sr_info->dbg_dir = debugfs_create_dir("smartreflex", vdd_dbg_dir);
|
||||
@@ -912,7 +912,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
|
||||
dev_err(&pdev->dev, "%s: Unable to create debugfs directory\n",
|
||||
__func__);
|
||||
ret = PTR_ERR(sr_info->dbg_dir);
|
||||
- goto err_release_region;
|
||||
+ goto err_iounmap;
|
||||
}
|
||||
|
||||
(void) debugfs_create_file("autocomp", S_IRUGO | S_IWUSR,
|
||||
@@ -929,7 +929,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
|
||||
dev_err(&pdev->dev, "%s: Unable to create debugfs directory"
|
||||
"for n-values\n", __func__);
|
||||
ret = PTR_ERR(nvalue_dir);
|
||||
- goto err_release_region;
|
||||
+ goto err_iounmap;
|
||||
}
|
||||
|
||||
omap_voltage_get_volttable(sr_info->voltdm, &volt_data);
|
||||
@@ -939,7 +939,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
|
||||
"entries for n-values\n",
|
||||
__func__, sr_info->voltdm->name);
|
||||
ret = -ENODATA;
|
||||
- goto err_release_region;
|
||||
+ goto err_iounmap;
|
||||
}
|
||||
|
||||
for (i = 0; i < sr_info->nvalue_count; i++) {
|
||||
@@ -953,6 +953,8 @@ static int __init omap_sr_probe(struct platform_device *pdev)
|
||||
|
||||
return ret;
|
||||
|
||||
+err_iounmap:
|
||||
+ iounmap(sr_info->base);
|
||||
err_release_region:
|
||||
release_mem_region(mem->start, resource_size(mem));
|
||||
err_free_devinfo:
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-29
@@ -1,29 +0,0 @@
|
||||
From 75fb23b53cbbd38aac84143ead8a33432dcfecdc Mon Sep 17 00:00:00 2001
|
||||
From: Aaro Koskinen <aaro.koskinen@nokia.com>
|
||||
Date: Thu, 24 Mar 2011 18:35:34 +0200
|
||||
Subject: [PATCH 37/59] OMAP3+: smartreflex: delete instance from sr_list on probe error
|
||||
|
||||
If the probe fails, the node should be deleted from sr_list.
|
||||
|
||||
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/smartreflex.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
|
||||
index 156807e..f0a488a 100644
|
||||
--- a/arch/arm/mach-omap2/smartreflex.c
|
||||
+++ b/arch/arm/mach-omap2/smartreflex.c
|
||||
@@ -954,6 +954,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
|
||||
return ret;
|
||||
|
||||
err_iounmap:
|
||||
+ list_del(&sr_info->node);
|
||||
iounmap(sr_info->base);
|
||||
err_release_region:
|
||||
release_mem_region(mem->start, resource_size(mem));
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-48
@@ -1,48 +0,0 @@
|
||||
From c919cf5aaa6a54e8ad944c550e2292830d17c526 Mon Sep 17 00:00:00 2001
|
||||
From: Aaro Koskinen <aaro.koskinen@nokia.com>
|
||||
Date: Thu, 24 Mar 2011 18:35:35 +0200
|
||||
Subject: [PATCH 38/59] OMAP3+: smartreflex: delete debugfs entries on probe error
|
||||
|
||||
Delete created debugfs entries if probe fails.
|
||||
|
||||
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/smartreflex.c | 6 ++++--
|
||||
1 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
|
||||
index f0a488a..fb7dc52 100644
|
||||
--- a/arch/arm/mach-omap2/smartreflex.c
|
||||
+++ b/arch/arm/mach-omap2/smartreflex.c
|
||||
@@ -929,7 +929,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
|
||||
dev_err(&pdev->dev, "%s: Unable to create debugfs directory"
|
||||
"for n-values\n", __func__);
|
||||
ret = PTR_ERR(nvalue_dir);
|
||||
- goto err_iounmap;
|
||||
+ goto err_debugfs;
|
||||
}
|
||||
|
||||
omap_voltage_get_volttable(sr_info->voltdm, &volt_data);
|
||||
@@ -939,7 +939,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
|
||||
"entries for n-values\n",
|
||||
__func__, sr_info->voltdm->name);
|
||||
ret = -ENODATA;
|
||||
- goto err_iounmap;
|
||||
+ goto err_debugfs;
|
||||
}
|
||||
|
||||
for (i = 0; i < sr_info->nvalue_count; i++) {
|
||||
@@ -953,6 +953,8 @@ static int __init omap_sr_probe(struct platform_device *pdev)
|
||||
|
||||
return ret;
|
||||
|
||||
+err_debugfs:
|
||||
+ debugfs_remove_recursive(sr_info->dbg_dir);
|
||||
err_iounmap:
|
||||
list_del(&sr_info->node);
|
||||
iounmap(sr_info->base);
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-57
@@ -1,57 +0,0 @@
|
||||
From be5b001b92e2c49f2f16d082e8ac33d371990ad4 Mon Sep 17 00:00:00 2001
|
||||
From: Jean Pihet <j-pihet@ti.com>
|
||||
Date: Fri, 29 Apr 2011 11:26:22 +0200
|
||||
Subject: [PATCH 39/59] OMAP3 cpuidle: remove useless SDP specific timings
|
||||
|
||||
The cpuidle states settings can be overriden by some board-
|
||||
specific settings, by calling omap3_pm_init_cpuidle.
|
||||
Remove the 3430SDP specific states settings registration
|
||||
since the figures are identical to the default ones (in cpuidle34xx.c).
|
||||
|
||||
Signed-off-by: Jean Pihet <j-pihet@ti.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/board-3430sdp.c | 19 -------------------
|
||||
1 files changed, 0 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
|
||||
index 9afd087..7ffad7b 100644
|
||||
--- a/arch/arm/mach-omap2/board-3430sdp.c
|
||||
+++ b/arch/arm/mach-omap2/board-3430sdp.c
|
||||
@@ -59,24 +59,6 @@
|
||||
|
||||
#define TWL4030_MSECURE_GPIO 22
|
||||
|
||||
-/* FIXME: These values need to be updated based on more profiling on 3430sdp*/
|
||||
-static struct cpuidle_params omap3_cpuidle_params_table[] = {
|
||||
- /* C1 */
|
||||
- {1, 2, 2, 5},
|
||||
- /* C2 */
|
||||
- {1, 10, 10, 30},
|
||||
- /* C3 */
|
||||
- {1, 50, 50, 300},
|
||||
- /* C4 */
|
||||
- {1, 1500, 1800, 4000},
|
||||
- /* C5 */
|
||||
- {1, 2500, 7500, 12000},
|
||||
- /* C6 */
|
||||
- {1, 3000, 8500, 15000},
|
||||
- /* C7 */
|
||||
- {1, 10000, 30000, 300000},
|
||||
-};
|
||||
-
|
||||
static uint32_t board_keymap[] = {
|
||||
KEY(0, 0, KEY_LEFT),
|
||||
KEY(0, 1, KEY_RIGHT),
|
||||
@@ -883,7 +865,6 @@ static void __init omap_3430sdp_init(void)
|
||||
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
|
||||
omap_board_config = sdp3430_config;
|
||||
omap_board_config_size = ARRAY_SIZE(sdp3430_config);
|
||||
- omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
|
||||
omap3430_i2c_init();
|
||||
omap_display_init(&sdp3430_dss_data);
|
||||
if (omap_rev() > OMAP3430_REV_ES1_0)
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-48
@@ -1,48 +0,0 @@
|
||||
From 4e63fe929ae78610afd830f7fded2e9f7b65ec21 Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Mon, 14 Feb 2011 12:16:36 +0530
|
||||
Subject: [PATCH 40/59] OMAP3+: SR: make notify independent of class
|
||||
|
||||
Interrupt notification mechanism of SmartReflex can be used by the
|
||||
choice of implementation of the class driver. For example, Class 2 and
|
||||
Class 1.5 of SmartReflex can both use the interrupt notification to
|
||||
identify the transition of voltage or other events.
|
||||
|
||||
Hence, the actual class does not matter for notifier. Let the class
|
||||
driver's handling decide how it should be used. SmartReflex driver
|
||||
should provide just the primitives.
|
||||
|
||||
Signed-off-by: Nishanth Menon <nm@ti.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/smartreflex.c | 6 ++----
|
||||
1 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
|
||||
index fb7dc52..3ee7261 100644
|
||||
--- a/arch/arm/mach-omap2/smartreflex.c
|
||||
+++ b/arch/arm/mach-omap2/smartreflex.c
|
||||
@@ -143,7 +143,7 @@ static irqreturn_t sr_interrupt(int irq, void *data)
|
||||
sr_write_reg(sr_info, IRQSTATUS, status);
|
||||
}
|
||||
|
||||
- if (sr_class->class_type == SR_CLASS2 && sr_class->notify)
|
||||
+ if (sr_class->notify)
|
||||
sr_class->notify(sr_info->voltdm, status);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
@@ -258,9 +258,7 @@ static int sr_late_init(struct omap_sr *sr_info)
|
||||
struct resource *mem;
|
||||
int ret = 0;
|
||||
|
||||
- if (sr_class->class_type == SR_CLASS2 &&
|
||||
- sr_class->notify_flags && sr_info->irq) {
|
||||
-
|
||||
+ if (sr_class->notify && sr_class->notify_flags && sr_info->irq) {
|
||||
name = kasprintf(GFP_KERNEL, "sr_%s", sr_info->voltdm->name);
|
||||
if (name == NULL) {
|
||||
ret = -ENOMEM;
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-37
@@ -1,37 +0,0 @@
|
||||
From bec14dd673e09459c45ef5b0408e68b92eebc404 Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Mon, 14 Feb 2011 12:41:10 +0530
|
||||
Subject: [PATCH 41/59] OMAP3+: SR: disable interrupt by default
|
||||
|
||||
We will enable and disable interrupt on a need basis in the class
|
||||
driver. We need to keep the IRQ disabled by default else the
|
||||
forceupdate or vcbypass events could trigger events that we don't
|
||||
need/expect to handle.
|
||||
|
||||
This is a preparation for SmartReflex AVS class drivers such as
|
||||
class 2 and class 1.5 which would need to use interrupts. Existing
|
||||
SmartReflex AVS class 3 driver does not require to use interrupts
|
||||
and is not impacted by this change.
|
||||
|
||||
Signed-off-by: Nishanth Menon <nm@ti.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/smartreflex.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
|
||||
index 3ee7261..616ef62 100644
|
||||
--- a/arch/arm/mach-omap2/smartreflex.c
|
||||
+++ b/arch/arm/mach-omap2/smartreflex.c
|
||||
@@ -268,6 +268,7 @@ static int sr_late_init(struct omap_sr *sr_info)
|
||||
0, name, (void *)sr_info);
|
||||
if (ret)
|
||||
goto error;
|
||||
+ disable_irq(sr_info->irq);
|
||||
}
|
||||
|
||||
if (pdata && pdata->enable_on_init)
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-41
@@ -1,41 +0,0 @@
|
||||
From 5f47ccf7f261602e30685bcf41c02ee8dc006fc9 Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Mon, 14 Feb 2011 21:14:17 +0530
|
||||
Subject: [PATCH 42/59] OMAP3+: SR: enable/disable SR only on need
|
||||
|
||||
Since we already know the state of the autocomp enablement, we can
|
||||
see if the requested state is different from the current state and
|
||||
enable/disable SR only on the need basis.
|
||||
|
||||
Signed-off-by: Nishanth Menon <nm@ti.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/smartreflex.c | 11 +++++++----
|
||||
1 files changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
|
||||
index 616ef62..3bd9fac 100644
|
||||
--- a/arch/arm/mach-omap2/smartreflex.c
|
||||
+++ b/arch/arm/mach-omap2/smartreflex.c
|
||||
@@ -807,10 +807,13 @@ static int omap_sr_autocomp_store(void *data, u64 val)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- if (!val)
|
||||
- sr_stop_vddautocomp(sr_info);
|
||||
- else
|
||||
- sr_start_vddautocomp(sr_info);
|
||||
+ /* control enable/disable only if there is a delta in value */
|
||||
+ if (sr_info->autocomp_active != val) {
|
||||
+ if (!val)
|
||||
+ sr_stop_vddautocomp(sr_info);
|
||||
+ else
|
||||
+ sr_start_vddautocomp(sr_info);
|
||||
+ }
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-49
@@ -1,49 +0,0 @@
|
||||
From ccdecc80f8c47e5fc20d10d17dd44d89302e0f83 Mon Sep 17 00:00:00 2001
|
||||
From: Nishanth Menon <nm@ti.com>
|
||||
Date: Mon, 14 Feb 2011 12:33:13 +0530
|
||||
Subject: [PATCH 43/59] OMAP3+: SR: fix cosmetic indentation
|
||||
|
||||
Error label case seems to have a 2 tab indentation when just 1 is
|
||||
necessary.
|
||||
|
||||
Signed-off-by: Nishanth Menon <nm@ti.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/mach-omap2/smartreflex.c | 20 ++++++++++----------
|
||||
1 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
|
||||
index 3bd9fac..2ce2fb7 100644
|
||||
--- a/arch/arm/mach-omap2/smartreflex.c
|
||||
+++ b/arch/arm/mach-omap2/smartreflex.c
|
||||
@@ -277,16 +277,16 @@ static int sr_late_init(struct omap_sr *sr_info)
|
||||
return ret;
|
||||
|
||||
error:
|
||||
- iounmap(sr_info->base);
|
||||
- mem = platform_get_resource(sr_info->pdev, IORESOURCE_MEM, 0);
|
||||
- release_mem_region(mem->start, resource_size(mem));
|
||||
- list_del(&sr_info->node);
|
||||
- dev_err(&sr_info->pdev->dev, "%s: ERROR in registering"
|
||||
- "interrupt handler. Smartreflex will"
|
||||
- "not function as desired\n", __func__);
|
||||
- kfree(name);
|
||||
- kfree(sr_info);
|
||||
- return ret;
|
||||
+ iounmap(sr_info->base);
|
||||
+ mem = platform_get_resource(sr_info->pdev, IORESOURCE_MEM, 0);
|
||||
+ release_mem_region(mem->start, resource_size(mem));
|
||||
+ list_del(&sr_info->node);
|
||||
+ dev_err(&sr_info->pdev->dev, "%s: ERROR in registering"
|
||||
+ "interrupt handler. Smartreflex will"
|
||||
+ "not function as desired\n", __func__);
|
||||
+ kfree(name);
|
||||
+ kfree(sr_info);
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
static void sr_v1_disable(struct omap_sr *sr)
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
Reference in New Issue
Block a user