diff options
Diffstat (limited to 'extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm')
12 files changed, 512 insertions, 0 deletions
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch new file mode 100644 index 00000000..0d1cbce6 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 4af697edf9d1d85d2735e86e86e1203c3509dcba Mon Sep 17 00:00:00 2001 | ||
2 | From: Nishanth Menon <nm@ti.com> | ||
3 | Date: Sat, 12 Feb 2011 17:27:14 +0530 | ||
4 | Subject: [PATCH 01/12] OMAP3+: voltage: remove spurious pr_notice for debugfs | ||
5 | |||
6 | cat of debugfs entry for vp_volt provides voltage. The additional pr_notice | ||
7 | is just spam on console and provides no additional information. | ||
8 | |||
9 | Signed-off-by: Nishanth Menon <nm@ti.com> | ||
10 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
11 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
12 | --- | ||
13 | arch/arm/mach-omap2/voltage.c | 1 - | ||
14 | 1 files changed, 0 insertions(+), 1 deletions(-) | ||
15 | |||
16 | diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c | ||
17 | index 0c1552d..9ef3789 100644 | ||
18 | --- a/arch/arm/mach-omap2/voltage.c | ||
19 | +++ b/arch/arm/mach-omap2/voltage.c | ||
20 | @@ -148,7 +148,6 @@ static int vp_volt_debug_get(void *data, u64 *val) | ||
21 | } | ||
22 | |||
23 | vsel = vdd->read_reg(prm_mod_offs, vdd->vp_data->voltage); | ||
24 | - pr_notice("curr_vsel = %x\n", vsel); | ||
25 | |||
26 | if (!vdd->pmic_info->vsel_to_uv) { | ||
27 | pr_warning("PMIC function to convert vsel to voltage" | ||
28 | -- | ||
29 | 1.6.6.1 | ||
30 | |||
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch new file mode 100644 index 00000000..7b137925 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 37fb1c8eeecd39542716d3d0c7c5e3ca0eb198f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nishanth Menon <nm@ti.com> | ||
3 | Date: Sun, 13 Mar 2011 09:07:23 +0530 | ||
4 | Subject: [PATCH 02/12] OMAP4: PM: remove redundant #ifdef CONFIG_PM | ||
5 | |||
6 | pm44xx.c is built only when CONFIG_PM is setup, | ||
7 | remove redundant CONFIG_PM check. | ||
8 | |||
9 | This also fixes: | ||
10 | https://bugzilla.kernel.org/show_bug.cgi?id=25022 | ||
11 | |||
12 | Reported-by: Martin Etti <ettl.martin@gmx.de> | ||
13 | |||
14 | Signed-off-by: Nishanth Menon <nm@ti.com> | ||
15 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
16 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
17 | --- | ||
18 | arch/arm/mach-omap2/pm44xx.c | 2 -- | ||
19 | 1 files changed, 0 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c | ||
22 | index 76cfff2..59a870b 100644 | ||
23 | --- a/arch/arm/mach-omap2/pm44xx.c | ||
24 | +++ b/arch/arm/mach-omap2/pm44xx.c | ||
25 | @@ -105,13 +105,11 @@ static int __init omap4_pm_init(void) | ||
26 | |||
27 | pr_err("Power Management for TI OMAP4.\n"); | ||
28 | |||
29 | -#ifdef CONFIG_PM | ||
30 | ret = pwrdm_for_each(pwrdms_setup, NULL); | ||
31 | if (ret) { | ||
32 | pr_err("Failed to setup powerdomains\n"); | ||
33 | goto err2; | ||
34 | } | ||
35 | -#endif | ||
36 | |||
37 | #ifdef CONFIG_SUSPEND | ||
38 | suspend_set_ops(&omap_pm_ops); | ||
39 | -- | ||
40 | 1.6.6.1 | ||
41 | |||
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch new file mode 100644 index 00000000..6c37b622 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From a22a0dcefe99c8ee260e0c489bc44e6e14bb1ccb Mon Sep 17 00:00:00 2001 | ||
2 | From: Aaro Koskinen <aaro.koskinen@nokia.com> | ||
3 | Date: Thu, 24 Mar 2011 18:35:31 +0200 | ||
4 | Subject: [PATCH 03/12] OMAP3+: smartreflex: fix sr_late_init() error path in probe | ||
5 | |||
6 | sr_late_init() will take care of freeing the resources. | ||
7 | |||
8 | Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> | ||
9 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
11 | --- | ||
12 | arch/arm/mach-omap2/smartreflex.c | 2 +- | ||
13 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
14 | |||
15 | diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c | ||
16 | index 13e24f9..dbc4b6f 100644 | ||
17 | --- a/arch/arm/mach-omap2/smartreflex.c | ||
18 | +++ b/arch/arm/mach-omap2/smartreflex.c | ||
19 | @@ -883,7 +883,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) | ||
20 | ret = sr_late_init(sr_info); | ||
21 | if (ret) { | ||
22 | pr_warning("%s: Error in SR late init\n", __func__); | ||
23 | - goto err_release_region; | ||
24 | + return ret; | ||
25 | } | ||
26 | } | ||
27 | |||
28 | -- | ||
29 | 1.6.6.1 | ||
30 | |||
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch new file mode 100644 index 00000000..263094d5 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From db9c7da6a78be8584c96c83a3a2d1c8aeb623da8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Aaro Koskinen <aaro.koskinen@nokia.com> | ||
3 | Date: Thu, 24 Mar 2011 18:35:32 +0200 | ||
4 | Subject: [PATCH 04/12] OMAP3+: smartreflex: request the memory region | ||
5 | |||
6 | We are releasing the memory region, but never actually request it. | ||
7 | |||
8 | Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> | ||
9 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
11 | --- | ||
12 | arch/arm/mach-omap2/smartreflex.c | 8 ++++++++ | ||
13 | 1 files changed, 8 insertions(+), 0 deletions(-) | ||
14 | |||
15 | diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c | ||
16 | index dbc4b6f..703143a 100644 | ||
17 | --- a/arch/arm/mach-omap2/smartreflex.c | ||
18 | +++ b/arch/arm/mach-omap2/smartreflex.c | ||
19 | @@ -847,6 +847,14 @@ static int __init omap_sr_probe(struct platform_device *pdev) | ||
20 | goto err_free_devinfo; | ||
21 | } | ||
22 | |||
23 | + mem = request_mem_region(mem->start, resource_size(mem), | ||
24 | + dev_name(&pdev->dev)); | ||
25 | + if (!mem) { | ||
26 | + dev_err(&pdev->dev, "%s: no mem region\n", __func__); | ||
27 | + ret = -EBUSY; | ||
28 | + goto err_free_devinfo; | ||
29 | + } | ||
30 | + | ||
31 | irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); | ||
32 | |||
33 | pm_runtime_enable(&pdev->dev); | ||
34 | -- | ||
35 | 1.6.6.1 | ||
36 | |||
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch new file mode 100644 index 00000000..ea1e5673 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | From b3ca51ac09da7c260c28df396d4c830814697ff0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Aaro Koskinen <aaro.koskinen@nokia.com> | ||
3 | Date: Thu, 24 Mar 2011 18:35:33 +0200 | ||
4 | Subject: [PATCH 05/12] OMAP3+: smartreflex: fix ioremap leak on probe error | ||
5 | |||
6 | Add missing iounmap() to error paths. | ||
7 | |||
8 | Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> | ||
9 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
11 | --- | ||
12 | arch/arm/mach-omap2/smartreflex.c | 10 ++++++---- | ||
13 | 1 files changed, 6 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c | ||
16 | index 703143a..156807e 100644 | ||
17 | --- a/arch/arm/mach-omap2/smartreflex.c | ||
18 | +++ b/arch/arm/mach-omap2/smartreflex.c | ||
19 | @@ -904,7 +904,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) | ||
20 | vdd_dbg_dir = omap_voltage_get_dbgdir(sr_info->voltdm); | ||
21 | if (!vdd_dbg_dir) { | ||
22 | ret = -EINVAL; | ||
23 | - goto err_release_region; | ||
24 | + goto err_iounmap; | ||
25 | } | ||
26 | |||
27 | sr_info->dbg_dir = debugfs_create_dir("smartreflex", vdd_dbg_dir); | ||
28 | @@ -912,7 +912,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) | ||
29 | dev_err(&pdev->dev, "%s: Unable to create debugfs directory\n", | ||
30 | __func__); | ||
31 | ret = PTR_ERR(sr_info->dbg_dir); | ||
32 | - goto err_release_region; | ||
33 | + goto err_iounmap; | ||
34 | } | ||
35 | |||
36 | (void) debugfs_create_file("autocomp", S_IRUGO | S_IWUSR, | ||
37 | @@ -929,7 +929,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) | ||
38 | dev_err(&pdev->dev, "%s: Unable to create debugfs directory" | ||
39 | "for n-values\n", __func__); | ||
40 | ret = PTR_ERR(nvalue_dir); | ||
41 | - goto err_release_region; | ||
42 | + goto err_iounmap; | ||
43 | } | ||
44 | |||
45 | omap_voltage_get_volttable(sr_info->voltdm, &volt_data); | ||
46 | @@ -939,7 +939,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) | ||
47 | "entries for n-values\n", | ||
48 | __func__, sr_info->voltdm->name); | ||
49 | ret = -ENODATA; | ||
50 | - goto err_release_region; | ||
51 | + goto err_iounmap; | ||
52 | } | ||
53 | |||
54 | for (i = 0; i < sr_info->nvalue_count; i++) { | ||
55 | @@ -953,6 +953,8 @@ static int __init omap_sr_probe(struct platform_device *pdev) | ||
56 | |||
57 | return ret; | ||
58 | |||
59 | +err_iounmap: | ||
60 | + iounmap(sr_info->base); | ||
61 | err_release_region: | ||
62 | release_mem_region(mem->start, resource_size(mem)); | ||
63 | err_free_devinfo: | ||
64 | -- | ||
65 | 1.6.6.1 | ||
66 | |||
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch new file mode 100644 index 00000000..cda6da63 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 92e63a2f098ce344cfc51ec9a7420e1a5cf85c3e Mon Sep 17 00:00:00 2001 | ||
2 | From: Aaro Koskinen <aaro.koskinen@nokia.com> | ||
3 | Date: Thu, 24 Mar 2011 18:35:34 +0200 | ||
4 | Subject: [PATCH 06/12] OMAP3+: smartreflex: delete instance from sr_list on probe error | ||
5 | |||
6 | If the probe fails, the node should be deleted from sr_list. | ||
7 | |||
8 | Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> | ||
9 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
11 | --- | ||
12 | arch/arm/mach-omap2/smartreflex.c | 1 + | ||
13 | 1 files changed, 1 insertions(+), 0 deletions(-) | ||
14 | |||
15 | diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c | ||
16 | index 156807e..f0a488a 100644 | ||
17 | --- a/arch/arm/mach-omap2/smartreflex.c | ||
18 | +++ b/arch/arm/mach-omap2/smartreflex.c | ||
19 | @@ -954,6 +954,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) | ||
20 | return ret; | ||
21 | |||
22 | err_iounmap: | ||
23 | + list_del(&sr_info->node); | ||
24 | iounmap(sr_info->base); | ||
25 | err_release_region: | ||
26 | release_mem_region(mem->start, resource_size(mem)); | ||
27 | -- | ||
28 | 1.6.6.1 | ||
29 | |||
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch new file mode 100644 index 00000000..d4543a46 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From c194377152df812bcb29fff8f217ffbde59089be Mon Sep 17 00:00:00 2001 | ||
2 | From: Aaro Koskinen <aaro.koskinen@nokia.com> | ||
3 | Date: Thu, 24 Mar 2011 18:35:35 +0200 | ||
4 | Subject: [PATCH 07/12] OMAP3+: smartreflex: delete debugfs entries on probe error | ||
5 | |||
6 | Delete created debugfs entries if probe fails. | ||
7 | |||
8 | Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> | ||
9 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
11 | --- | ||
12 | arch/arm/mach-omap2/smartreflex.c | 6 ++++-- | ||
13 | 1 files changed, 4 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c | ||
16 | index f0a488a..fb7dc52 100644 | ||
17 | --- a/arch/arm/mach-omap2/smartreflex.c | ||
18 | +++ b/arch/arm/mach-omap2/smartreflex.c | ||
19 | @@ -929,7 +929,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) | ||
20 | dev_err(&pdev->dev, "%s: Unable to create debugfs directory" | ||
21 | "for n-values\n", __func__); | ||
22 | ret = PTR_ERR(nvalue_dir); | ||
23 | - goto err_iounmap; | ||
24 | + goto err_debugfs; | ||
25 | } | ||
26 | |||
27 | omap_voltage_get_volttable(sr_info->voltdm, &volt_data); | ||
28 | @@ -939,7 +939,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) | ||
29 | "entries for n-values\n", | ||
30 | __func__, sr_info->voltdm->name); | ||
31 | ret = -ENODATA; | ||
32 | - goto err_iounmap; | ||
33 | + goto err_debugfs; | ||
34 | } | ||
35 | |||
36 | for (i = 0; i < sr_info->nvalue_count; i++) { | ||
37 | @@ -953,6 +953,8 @@ static int __init omap_sr_probe(struct platform_device *pdev) | ||
38 | |||
39 | return ret; | ||
40 | |||
41 | +err_debugfs: | ||
42 | + debugfs_remove_recursive(sr_info->dbg_dir); | ||
43 | err_iounmap: | ||
44 | list_del(&sr_info->node); | ||
45 | iounmap(sr_info->base); | ||
46 | -- | ||
47 | 1.6.6.1 | ||
48 | |||
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch new file mode 100644 index 00000000..e3ee0412 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | From 2b9e07516cc3853340b5e06e9ae7244ca5681466 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jean Pihet <j-pihet@ti.com> | ||
3 | Date: Fri, 29 Apr 2011 11:26:22 +0200 | ||
4 | Subject: [PATCH 08/12] OMAP3 cpuidle: remove useless SDP specific timings | ||
5 | |||
6 | The cpuidle states settings can be overriden by some board- | ||
7 | specific settings, by calling omap3_pm_init_cpuidle. | ||
8 | Remove the 3430SDP specific states settings registration | ||
9 | since the figures are identical to the default ones (in cpuidle34xx.c). | ||
10 | |||
11 | Signed-off-by: Jean Pihet <j-pihet@ti.com> | ||
12 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
13 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
14 | --- | ||
15 | arch/arm/mach-omap2/board-3430sdp.c | 19 ------------------- | ||
16 | 1 files changed, 0 insertions(+), 19 deletions(-) | ||
17 | |||
18 | diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c | ||
19 | index 9afd087..7ffad7b 100644 | ||
20 | --- a/arch/arm/mach-omap2/board-3430sdp.c | ||
21 | +++ b/arch/arm/mach-omap2/board-3430sdp.c | ||
22 | @@ -59,24 +59,6 @@ | ||
23 | |||
24 | #define TWL4030_MSECURE_GPIO 22 | ||
25 | |||
26 | -/* FIXME: These values need to be updated based on more profiling on 3430sdp*/ | ||
27 | -static struct cpuidle_params omap3_cpuidle_params_table[] = { | ||
28 | - /* C1 */ | ||
29 | - {1, 2, 2, 5}, | ||
30 | - /* C2 */ | ||
31 | - {1, 10, 10, 30}, | ||
32 | - /* C3 */ | ||
33 | - {1, 50, 50, 300}, | ||
34 | - /* C4 */ | ||
35 | - {1, 1500, 1800, 4000}, | ||
36 | - /* C5 */ | ||
37 | - {1, 2500, 7500, 12000}, | ||
38 | - /* C6 */ | ||
39 | - {1, 3000, 8500, 15000}, | ||
40 | - /* C7 */ | ||
41 | - {1, 10000, 30000, 300000}, | ||
42 | -}; | ||
43 | - | ||
44 | static uint32_t board_keymap[] = { | ||
45 | KEY(0, 0, KEY_LEFT), | ||
46 | KEY(0, 1, KEY_RIGHT), | ||
47 | @@ -883,7 +865,6 @@ static void __init omap_3430sdp_init(void) | ||
48 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | ||
49 | omap_board_config = sdp3430_config; | ||
50 | omap_board_config_size = ARRAY_SIZE(sdp3430_config); | ||
51 | - omap3_pm_init_cpuidle(omap3_cpuidle_params_table); | ||
52 | omap3430_i2c_init(); | ||
53 | omap_display_init(&sdp3430_dss_data); | ||
54 | if (omap_rev() > OMAP3430_REV_ES1_0) | ||
55 | -- | ||
56 | 1.6.6.1 | ||
57 | |||
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch new file mode 100644 index 00000000..c44371df --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From a0f28097b944930e479998780863b9e5a39e30b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nishanth Menon <nm@ti.com> | ||
3 | Date: Mon, 14 Feb 2011 12:16:36 +0530 | ||
4 | Subject: [PATCH 09/12] OMAP3+: SR: make notify independent of class | ||
5 | |||
6 | Interrupt notification mechanism of SmartReflex can be used by the | ||
7 | choice of implementation of the class driver. For example, Class 2 and | ||
8 | Class 1.5 of SmartReflex can both use the interrupt notification to | ||
9 | identify the transition of voltage or other events. | ||
10 | |||
11 | Hence, the actual class does not matter for notifier. Let the class | ||
12 | driver's handling decide how it should be used. SmartReflex driver | ||
13 | should provide just the primitives. | ||
14 | |||
15 | Signed-off-by: Nishanth Menon <nm@ti.com> | ||
16 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
17 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
18 | --- | ||
19 | arch/arm/mach-omap2/smartreflex.c | 6 ++---- | ||
20 | 1 files changed, 2 insertions(+), 4 deletions(-) | ||
21 | |||
22 | diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c | ||
23 | index fb7dc52..3ee7261 100644 | ||
24 | --- a/arch/arm/mach-omap2/smartreflex.c | ||
25 | +++ b/arch/arm/mach-omap2/smartreflex.c | ||
26 | @@ -143,7 +143,7 @@ static irqreturn_t sr_interrupt(int irq, void *data) | ||
27 | sr_write_reg(sr_info, IRQSTATUS, status); | ||
28 | } | ||
29 | |||
30 | - if (sr_class->class_type == SR_CLASS2 && sr_class->notify) | ||
31 | + if (sr_class->notify) | ||
32 | sr_class->notify(sr_info->voltdm, status); | ||
33 | |||
34 | return IRQ_HANDLED; | ||
35 | @@ -258,9 +258,7 @@ static int sr_late_init(struct omap_sr *sr_info) | ||
36 | struct resource *mem; | ||
37 | int ret = 0; | ||
38 | |||
39 | - if (sr_class->class_type == SR_CLASS2 && | ||
40 | - sr_class->notify_flags && sr_info->irq) { | ||
41 | - | ||
42 | + if (sr_class->notify && sr_class->notify_flags && sr_info->irq) { | ||
43 | name = kasprintf(GFP_KERNEL, "sr_%s", sr_info->voltdm->name); | ||
44 | if (name == NULL) { | ||
45 | ret = -ENOMEM; | ||
46 | -- | ||
47 | 1.6.6.1 | ||
48 | |||
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch new file mode 100644 index 00000000..e25c3e86 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From ca5dc57538a566681731102e09a9d1865a4a7020 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nishanth Menon <nm@ti.com> | ||
3 | Date: Mon, 14 Feb 2011 12:41:10 +0530 | ||
4 | Subject: [PATCH 10/12] OMAP3+: SR: disable interrupt by default | ||
5 | |||
6 | We will enable and disable interrupt on a need basis in the class | ||
7 | driver. We need to keep the IRQ disabled by default else the | ||
8 | forceupdate or vcbypass events could trigger events that we don't | ||
9 | need/expect to handle. | ||
10 | |||
11 | This is a preparation for SmartReflex AVS class drivers such as | ||
12 | class 2 and class 1.5 which would need to use interrupts. Existing | ||
13 | SmartReflex AVS class 3 driver does not require to use interrupts | ||
14 | and is not impacted by this change. | ||
15 | |||
16 | Signed-off-by: Nishanth Menon <nm@ti.com> | ||
17 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
18 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
19 | --- | ||
20 | arch/arm/mach-omap2/smartreflex.c | 1 + | ||
21 | 1 files changed, 1 insertions(+), 0 deletions(-) | ||
22 | |||
23 | diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c | ||
24 | index 3ee7261..616ef62 100644 | ||
25 | --- a/arch/arm/mach-omap2/smartreflex.c | ||
26 | +++ b/arch/arm/mach-omap2/smartreflex.c | ||
27 | @@ -268,6 +268,7 @@ static int sr_late_init(struct omap_sr *sr_info) | ||
28 | 0, name, (void *)sr_info); | ||
29 | if (ret) | ||
30 | goto error; | ||
31 | + disable_irq(sr_info->irq); | ||
32 | } | ||
33 | |||
34 | if (pdata && pdata->enable_on_init) | ||
35 | -- | ||
36 | 1.6.6.1 | ||
37 | |||
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch new file mode 100644 index 00000000..b96682ea --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 4aa67e94d6b13905abcf3e95cb66ea7be9c2e8dd Mon Sep 17 00:00:00 2001 | ||
2 | From: Nishanth Menon <nm@ti.com> | ||
3 | Date: Mon, 14 Feb 2011 21:14:17 +0530 | ||
4 | Subject: [PATCH 11/12] OMAP3+: SR: enable/disable SR only on need | ||
5 | |||
6 | Since we already know the state of the autocomp enablement, we can | ||
7 | see if the requested state is different from the current state and | ||
8 | enable/disable SR only on the need basis. | ||
9 | |||
10 | Signed-off-by: Nishanth Menon <nm@ti.com> | ||
11 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
12 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
13 | --- | ||
14 | arch/arm/mach-omap2/smartreflex.c | 11 +++++++---- | ||
15 | 1 files changed, 7 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c | ||
18 | index 616ef62..3bd9fac 100644 | ||
19 | --- a/arch/arm/mach-omap2/smartreflex.c | ||
20 | +++ b/arch/arm/mach-omap2/smartreflex.c | ||
21 | @@ -807,10 +807,13 @@ static int omap_sr_autocomp_store(void *data, u64 val) | ||
22 | return -EINVAL; | ||
23 | } | ||
24 | |||
25 | - if (!val) | ||
26 | - sr_stop_vddautocomp(sr_info); | ||
27 | - else | ||
28 | - sr_start_vddautocomp(sr_info); | ||
29 | + /* control enable/disable only if there is a delta in value */ | ||
30 | + if (sr_info->autocomp_active != val) { | ||
31 | + if (!val) | ||
32 | + sr_stop_vddautocomp(sr_info); | ||
33 | + else | ||
34 | + sr_start_vddautocomp(sr_info); | ||
35 | + } | ||
36 | |||
37 | return 0; | ||
38 | } | ||
39 | -- | ||
40 | 1.6.6.1 | ||
41 | |||
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch new file mode 100644 index 00000000..eda76a0d --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 0c2089eecdfc3a85a376eddf9c77857f3d575be6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nishanth Menon <nm@ti.com> | ||
3 | Date: Mon, 14 Feb 2011 12:33:13 +0530 | ||
4 | Subject: [PATCH 12/12] OMAP3+: SR: fix cosmetic indentation | ||
5 | |||
6 | Error label case seems to have a 2 tab indentation when just 1 is | ||
7 | necessary. | ||
8 | |||
9 | Signed-off-by: Nishanth Menon <nm@ti.com> | ||
10 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
11 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
12 | --- | ||
13 | arch/arm/mach-omap2/smartreflex.c | 20 ++++++++++---------- | ||
14 | 1 files changed, 10 insertions(+), 10 deletions(-) | ||
15 | |||
16 | diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c | ||
17 | index 3bd9fac..2ce2fb7 100644 | ||
18 | --- a/arch/arm/mach-omap2/smartreflex.c | ||
19 | +++ b/arch/arm/mach-omap2/smartreflex.c | ||
20 | @@ -277,16 +277,16 @@ static int sr_late_init(struct omap_sr *sr_info) | ||
21 | return ret; | ||
22 | |||
23 | error: | ||
24 | - iounmap(sr_info->base); | ||
25 | - mem = platform_get_resource(sr_info->pdev, IORESOURCE_MEM, 0); | ||
26 | - release_mem_region(mem->start, resource_size(mem)); | ||
27 | - list_del(&sr_info->node); | ||
28 | - dev_err(&sr_info->pdev->dev, "%s: ERROR in registering" | ||
29 | - "interrupt handler. Smartreflex will" | ||
30 | - "not function as desired\n", __func__); | ||
31 | - kfree(name); | ||
32 | - kfree(sr_info); | ||
33 | - return ret; | ||
34 | + iounmap(sr_info->base); | ||
35 | + mem = platform_get_resource(sr_info->pdev, IORESOURCE_MEM, 0); | ||
36 | + release_mem_region(mem->start, resource_size(mem)); | ||
37 | + list_del(&sr_info->node); | ||
38 | + dev_err(&sr_info->pdev->dev, "%s: ERROR in registering" | ||
39 | + "interrupt handler. Smartreflex will" | ||
40 | + "not function as desired\n", __func__); | ||
41 | + kfree(name); | ||
42 | + kfree(sr_info); | ||
43 | + return ret; | ||
44 | } | ||
45 | |||
46 | static void sr_v1_disable(struct omap_sr *sr) | ||
47 | -- | ||
48 | 1.6.6.1 | ||
49 | |||