From: Greg Kroah-Hartman Date: Fri, 23 Mar 2012 16:53:08 +0000 (-0700) Subject: delete some pm patches for 3.2 and 3.3 X-Git-Tag: v3.0.26~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16daf1c85ff7be17c3dc2cf556f6430e4879bf9b;p=thirdparty%2Fkernel%2Fstable-queue.git delete some pm patches for 3.2 and 3.3 --- diff --git a/queue-3.2/pm-shmobile-make-cmt-driver-use-pm_genpd_dev_always_on.patch b/queue-3.2/pm-shmobile-make-cmt-driver-use-pm_genpd_dev_always_on.patch deleted file mode 100644 index d72062fdddb..00000000000 --- a/queue-3.2/pm-shmobile-make-cmt-driver-use-pm_genpd_dev_always_on.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 615a445f7f8a077c145e737864ae59a4d8717882 Mon Sep 17 00:00:00 2001 -From: "Rafael J. Wysocki" -Date: Tue, 13 Mar 2012 22:40:06 +0100 -Subject: PM / shmobile: Make CMT driver use pm_genpd_dev_always_on() - -From: "Rafael J. Wysocki" - -commit 615a445f7f8a077c145e737864ae59a4d8717882 upstream. - -Make the CMT clocksource driver mark its device as "always on" -using pm_genpd_dev_always_on() to protect it from surprise power -removals. - -Signed-off-by: Rafael J. Wysocki -Tested-by: Simon Horman -Acked-by: Paul Mundt -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/clocksource/sh_cmt.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/clocksource/sh_cmt.c -+++ b/drivers/clocksource/sh_cmt.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - struct sh_cmt_priv { - void __iomem *mapbase; -@@ -689,6 +690,9 @@ static int __devinit sh_cmt_probe(struct - struct sh_cmt_priv *p = platform_get_drvdata(pdev); - int ret; - -+ if (!is_early_platform_device(pdev)) -+ pm_genpd_dev_always_on(&pdev->dev, true); -+ - if (p) { - dev_info(&pdev->dev, "kept as earlytimer\n"); - return 0; diff --git a/queue-3.2/pm-shmobile-make-mtu2-driver-use-pm_genpd_dev_always_on.patch b/queue-3.2/pm-shmobile-make-mtu2-driver-use-pm_genpd_dev_always_on.patch deleted file mode 100644 index c63dfa2a473..00000000000 --- a/queue-3.2/pm-shmobile-make-mtu2-driver-use-pm_genpd_dev_always_on.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 57d13370cfaf6017c68981e66ff5b3bf20a2705c Mon Sep 17 00:00:00 2001 -From: "Rafael J. Wysocki" -Date: Tue, 13 Mar 2012 22:40:14 +0100 -Subject: PM / shmobile: Make MTU2 driver use pm_genpd_dev_always_on() - -From: "Rafael J. Wysocki" - -commit 57d13370cfaf6017c68981e66ff5b3bf20a2705c upstream. - -Make the MTU2 clocksource driver mark its device as "always on" -using pm_genpd_dev_always_on() to protect it from surprise power -removals. - -Signed-off-by: Rafael J. Wysocki -Tested-by: Simon Horman -Acked-by: Paul Mundt -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/clocksource/sh_mtu2.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/clocksource/sh_mtu2.c -+++ b/drivers/clocksource/sh_mtu2.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - struct sh_mtu2_priv { - void __iomem *mapbase; -@@ -306,6 +307,9 @@ static int __devinit sh_mtu2_probe(struc - struct sh_mtu2_priv *p = platform_get_drvdata(pdev); - int ret; - -+ if (!is_early_platform_device(pdev)) -+ pm_genpd_dev_always_on(&pdev->dev, true); -+ - if (p) { - dev_info(&pdev->dev, "kept as earlytimer\n"); - return 0; diff --git a/queue-3.2/pm-shmobile-make-tmu-driver-use-pm_genpd_dev_always_on.patch b/queue-3.2/pm-shmobile-make-tmu-driver-use-pm_genpd_dev_always_on.patch deleted file mode 100644 index 3a61e7e8ea8..00000000000 --- a/queue-3.2/pm-shmobile-make-tmu-driver-use-pm_genpd_dev_always_on.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2ee619f9487c2acc1efdf2c78e68e2bd51b635fa Mon Sep 17 00:00:00 2001 -From: "Rafael J. Wysocki" -Date: Tue, 13 Mar 2012 22:40:00 +0100 -Subject: PM / shmobile: Make TMU driver use pm_genpd_dev_always_on() - -From: "Rafael J. Wysocki" - -commit 2ee619f9487c2acc1efdf2c78e68e2bd51b635fa upstream. - -Make the TMU clocksource driver mark its device as "always on" -using pm_genpd_dev_always_on() to protect it from surprise power -removals and make sh7372_add_standard_devices() add TMU devices on -sh7372 to the A4R power domain so that their "always on" flags -are taken into account as appropriate. - -Signed-off-by: Rafael J. Wysocki -Tested-by: Simon Horman -Acked-by: Paul Mundt -Signed-off-by: Greg Kroah-Hartman - ---- - arch/arm/mach-shmobile/setup-sh7372.c | 2 ++ - drivers/clocksource/sh_tmu.c | 4 ++++ - 2 files changed, 6 insertions(+) - ---- a/arch/arm/mach-shmobile/setup-sh7372.c -+++ b/arch/arm/mach-shmobile/setup-sh7372.c -@@ -1028,6 +1028,8 @@ void __init sh7372_add_standard_devices( - sh7372_add_device_to_domain(&sh7372_a4r, &veu2_device); - sh7372_add_device_to_domain(&sh7372_a4r, &veu3_device); - sh7372_add_device_to_domain(&sh7372_a4r, &jpu_device); -+ sh7372_add_device_to_domain(&sh7372_a4r, &tmu00_device); -+ sh7372_add_device_to_domain(&sh7372_a4r, &tmu01_device); - } - - void __init sh7372_add_early_devices(void) ---- a/drivers/clocksource/sh_tmu.c -+++ b/drivers/clocksource/sh_tmu.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - struct sh_tmu_priv { - void __iomem *mapbase; -@@ -410,6 +411,9 @@ static int __devinit sh_tmu_probe(struct - struct sh_tmu_priv *p = platform_get_drvdata(pdev); - int ret; - -+ if (!is_early_platform_device(pdev)) -+ pm_genpd_dev_always_on(&pdev->dev, true); -+ - if (p) { - dev_info(&pdev->dev, "kept as earlytimer\n"); - return 0; diff --git a/queue-3.2/series b/queue-3.2/series index ba31118d18d..35006cda70d 100644 --- a/queue-3.2/series +++ b/queue-3.2/series @@ -55,9 +55,6 @@ x86-ioapic-add-register-level-checks-to-detect-bogus-io-apic-entries.patch mm-thp-fix-pmd_bad-triggering-in-code-paths-holding-mmap_sem-read-mode.patch tpm-zero-buffer-whole-after-copying-to-userspace.patch pm-domains-fix-handling-of-wakeup-devices-during-system-resume.patch -pm-shmobile-make-mtu2-driver-use-pm_genpd_dev_always_on.patch -pm-shmobile-make-cmt-driver-use-pm_genpd_dev_always_on.patch -pm-shmobile-make-tmu-driver-use-pm_genpd_dev_always_on.patch bootmem-sparsemem-remove-limit-constraint-in-alloc_bootmem_section.patch hugetlbfs-avoid-taking-i_mutex-from-hugetlbfs_read.patch asoc-fsl-p1022ds-tell-the-wm8776-codec-driver-that-it-s-the-master.patch diff --git a/queue-3.3/pm-shmobile-make-cmt-driver-use-pm_genpd_dev_always_on.patch b/queue-3.3/pm-shmobile-make-cmt-driver-use-pm_genpd_dev_always_on.patch deleted file mode 100644 index d72062fdddb..00000000000 --- a/queue-3.3/pm-shmobile-make-cmt-driver-use-pm_genpd_dev_always_on.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 615a445f7f8a077c145e737864ae59a4d8717882 Mon Sep 17 00:00:00 2001 -From: "Rafael J. Wysocki" -Date: Tue, 13 Mar 2012 22:40:06 +0100 -Subject: PM / shmobile: Make CMT driver use pm_genpd_dev_always_on() - -From: "Rafael J. Wysocki" - -commit 615a445f7f8a077c145e737864ae59a4d8717882 upstream. - -Make the CMT clocksource driver mark its device as "always on" -using pm_genpd_dev_always_on() to protect it from surprise power -removals. - -Signed-off-by: Rafael J. Wysocki -Tested-by: Simon Horman -Acked-by: Paul Mundt -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/clocksource/sh_cmt.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/clocksource/sh_cmt.c -+++ b/drivers/clocksource/sh_cmt.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - struct sh_cmt_priv { - void __iomem *mapbase; -@@ -689,6 +690,9 @@ static int __devinit sh_cmt_probe(struct - struct sh_cmt_priv *p = platform_get_drvdata(pdev); - int ret; - -+ if (!is_early_platform_device(pdev)) -+ pm_genpd_dev_always_on(&pdev->dev, true); -+ - if (p) { - dev_info(&pdev->dev, "kept as earlytimer\n"); - return 0; diff --git a/queue-3.3/pm-shmobile-make-mtu2-driver-use-pm_genpd_dev_always_on.patch b/queue-3.3/pm-shmobile-make-mtu2-driver-use-pm_genpd_dev_always_on.patch deleted file mode 100644 index c63dfa2a473..00000000000 --- a/queue-3.3/pm-shmobile-make-mtu2-driver-use-pm_genpd_dev_always_on.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 57d13370cfaf6017c68981e66ff5b3bf20a2705c Mon Sep 17 00:00:00 2001 -From: "Rafael J. Wysocki" -Date: Tue, 13 Mar 2012 22:40:14 +0100 -Subject: PM / shmobile: Make MTU2 driver use pm_genpd_dev_always_on() - -From: "Rafael J. Wysocki" - -commit 57d13370cfaf6017c68981e66ff5b3bf20a2705c upstream. - -Make the MTU2 clocksource driver mark its device as "always on" -using pm_genpd_dev_always_on() to protect it from surprise power -removals. - -Signed-off-by: Rafael J. Wysocki -Tested-by: Simon Horman -Acked-by: Paul Mundt -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/clocksource/sh_mtu2.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/clocksource/sh_mtu2.c -+++ b/drivers/clocksource/sh_mtu2.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - struct sh_mtu2_priv { - void __iomem *mapbase; -@@ -306,6 +307,9 @@ static int __devinit sh_mtu2_probe(struc - struct sh_mtu2_priv *p = platform_get_drvdata(pdev); - int ret; - -+ if (!is_early_platform_device(pdev)) -+ pm_genpd_dev_always_on(&pdev->dev, true); -+ - if (p) { - dev_info(&pdev->dev, "kept as earlytimer\n"); - return 0; diff --git a/queue-3.3/pm-shmobile-make-tmu-driver-use-pm_genpd_dev_always_on.patch b/queue-3.3/pm-shmobile-make-tmu-driver-use-pm_genpd_dev_always_on.patch deleted file mode 100644 index 346fe61b3ab..00000000000 --- a/queue-3.3/pm-shmobile-make-tmu-driver-use-pm_genpd_dev_always_on.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2ee619f9487c2acc1efdf2c78e68e2bd51b635fa Mon Sep 17 00:00:00 2001 -From: "Rafael J. Wysocki" -Date: Tue, 13 Mar 2012 22:40:00 +0100 -Subject: PM / shmobile: Make TMU driver use pm_genpd_dev_always_on() - -From: "Rafael J. Wysocki" - -commit 2ee619f9487c2acc1efdf2c78e68e2bd51b635fa upstream. - -Make the TMU clocksource driver mark its device as "always on" -using pm_genpd_dev_always_on() to protect it from surprise power -removals and make sh7372_add_standard_devices() add TMU devices on -sh7372 to the A4R power domain so that their "always on" flags -are taken into account as appropriate. - -Signed-off-by: Rafael J. Wysocki -Tested-by: Simon Horman -Acked-by: Paul Mundt -Signed-off-by: Greg Kroah-Hartman - ---- - arch/arm/mach-shmobile/setup-sh7372.c | 2 ++ - drivers/clocksource/sh_tmu.c | 4 ++++ - 2 files changed, 6 insertions(+) - ---- a/arch/arm/mach-shmobile/setup-sh7372.c -+++ b/arch/arm/mach-shmobile/setup-sh7372.c -@@ -1043,6 +1043,8 @@ void __init sh7372_add_standard_devices( - sh7372_add_device_to_domain(&sh7372_a4r, &veu2_device); - sh7372_add_device_to_domain(&sh7372_a4r, &veu3_device); - sh7372_add_device_to_domain(&sh7372_a4r, &jpu_device); -+ sh7372_add_device_to_domain(&sh7372_a4r, &tmu00_device); -+ sh7372_add_device_to_domain(&sh7372_a4r, &tmu01_device); - } - - void __init sh7372_add_early_devices(void) ---- a/drivers/clocksource/sh_tmu.c -+++ b/drivers/clocksource/sh_tmu.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - struct sh_tmu_priv { - void __iomem *mapbase; -@@ -410,6 +411,9 @@ static int __devinit sh_tmu_probe(struct - struct sh_tmu_priv *p = platform_get_drvdata(pdev); - int ret; - -+ if (!is_early_platform_device(pdev)) -+ pm_genpd_dev_always_on(&pdev->dev, true); -+ - if (p) { - dev_info(&pdev->dev, "kept as earlytimer\n"); - return 0; diff --git a/queue-3.3/series b/queue-3.3/series index 00e49d87419..867f0e39fea 100644 --- a/queue-3.3/series +++ b/queue-3.3/series @@ -62,9 +62,6 @@ x86-ioapic-add-register-level-checks-to-detect-bogus-io-apic-entries.patch mm-thp-fix-pmd_bad-triggering-in-code-paths-holding-mmap_sem-read-mode.patch tpm-zero-buffer-whole-after-copying-to-userspace.patch pm-domains-fix-handling-of-wakeup-devices-during-system-resume.patch -pm-shmobile-make-mtu2-driver-use-pm_genpd_dev_always_on.patch -pm-shmobile-make-cmt-driver-use-pm_genpd_dev_always_on.patch -pm-shmobile-make-tmu-driver-use-pm_genpd_dev_always_on.patch bootmem-sparsemem-remove-limit-constraint-in-alloc_bootmem_section.patch hugetlbfs-avoid-taking-i_mutex-from-hugetlbfs_read.patch asoc-fsl-p1022ds-tell-the-wm8776-codec-driver-that-it-s-the-master.patch