diff for duplicates of <5162A419.6040504@ti.com> diff --git a/a/1.txt b/N1/1.txt index ac92180..712dcdd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -161,3 +161,12 @@ index 5ba6d88..228deca 100644 return ret; -- 1.7.9.5 + + +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0001-ARM-OMAP4-PM-Consolidate-OMAP4-PM-code-to-re-use-it-.patch +Type: text/x-patch +Size: 4344 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130408/ab185ebf/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index afc5c0d..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,6 +0,0 @@ -Content-Type: text/x-patch; - name="0001-ARM-OMAP4-PM-Consolidate-OMAP4-PM-code-to-re-use-it-.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename*0="0001-ARM-OMAP4-PM-Consolidate-OMAP4-PM-code-to-re-use-it-.pa"; - filename*1="tch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index e3889dd..0000000 --- a/a/2.txt +++ /dev/null @@ -1,139 +0,0 @@ ->From 428289ddf30a6a34f7e459720e5f6bf59ce4fe63 Mon Sep 17 00:00:00 2001 -From: Santosh Shilimkar <santosh.shilimkar@ti.com> -Date: Thu, 12 Apr 2012 16:51:47 +0530 -Subject: [PATCH] ARM: OMAP4+: PM: Consolidate OMAP4 PM code to re-use it for - OMAP5 - -OMAP5 has backward compatible PRCM block and it's programming -model is mostly similar to OMAP4. Same is going to be maintained -for future OMAP4 based SOCs. Hence consolidate the OMAP4 power -management code so that it can be re-used on OMAP5 and later devices. - -While at it, update the kernel-doc for omap4_pm_init(). - -Acked-by: Nishanth Menon <nm@ti.com> -Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> ---- - arch/arm/mach-omap2/pm44xx.c | 58 ++++++++++++++++++++++++++++++++++-------- - 1 file changed, 48 insertions(+), 10 deletions(-) - -diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c -index 5ba6d88..228deca 100644 ---- a/arch/arm/mach-omap2/pm44xx.c -+++ b/arch/arm/mach-omap2/pm44xx.c -@@ -1,7 +1,7 @@ - /* -- * OMAP4 Power Management Routines -+ * OMAP4+ Power Management Routines - * -- * Copyright (C) 2010-2011 Texas Instruments, Inc. -+ * Copyright (C) 2010-2013 Texas Instruments, Inc. - * Rajendra Nayak <rnayak@ti.com> - * Santosh Shilimkar <santosh.shilimkar@ti.com> - * -@@ -135,16 +135,16 @@ static void omap_default_idle(void) - } - - /** -- * omap4_pm_init - Init routine for OMAP4 PM -+ * omap4_init_static_deps - Add OMAP4 static dependencies - * -- * Initializes all powerdomain and clockdomain target states -- * and all PRCM settings. -+ * Add needed static clockdomain dependencies on OMAP4 devices. -+ * Return: 0 on success or 'err' on failures - */ --int __init omap4_pm_init(void) -+static inline int omap4_init_static_deps(void) - { -- int ret; - struct clockdomain *emif_clkdm, *mpuss_clkdm, *l3_1_clkdm; - struct clockdomain *ducati_clkdm, *l3_2_clkdm; -+ int ret = 0; - - if (omap_rev() == OMAP4430_REV_ES1_0) { - WARN(1, "Power Management not supported on OMAP4430 ES1.0\n"); -@@ -163,7 +163,7 @@ int __init omap4_pm_init(void) - ret = pwrdm_for_each(pwrdms_setup, NULL); - if (ret) { - pr_err("Failed to setup powerdomains\n"); -- goto err2; -+ return ret; - } - - /* -@@ -171,6 +171,10 @@ int __init omap4_pm_init(void) - * MPUSS -> L4_PER/L3_* and DUCATI -> L3_* doesn't work as - * expected. The hardware recommendation is to enable static - * dependencies for these to avoid system lock ups or random crashes. -+ * The L4 wakeup depedency is added to workaround the OCP sync hardware -+ * BUG with 32K synctimer which lead to incorrect timer value read -+ * from the 32K counter. The BUG applies for GPTIMER1 and WDT2 which -+ * are part of L4 wakeup clockdomain. - */ - mpuss_clkdm = clkdm_lookup("mpuss_clkdm"); - emif_clkdm = clkdm_lookup("l3_emif_clkdm"); -@@ -179,7 +183,7 @@ int __init omap4_pm_init(void) - ducati_clkdm = clkdm_lookup("ducati_clkdm"); - if ((!mpuss_clkdm) || (!emif_clkdm) || (!l3_1_clkdm) || - (!l3_2_clkdm) || (!ducati_clkdm)) -- goto err2; -+ return -EINVAL; - - ret = clkdm_add_wkdep(mpuss_clkdm, emif_clkdm); - ret |= clkdm_add_wkdep(mpuss_clkdm, l3_1_clkdm); -@@ -188,9 +192,42 @@ int __init omap4_pm_init(void) - ret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm); - if (ret) { - pr_err("Failed to add MPUSS -> L3/EMIF/L4PER, DUCATI -> L3 wakeup dependency\n"); -+ return -EINVAL; -+ } -+ -+ return ret; -+} -+ -+/** -+ * omap4_pm_init - Init routine for OMAP4+ devices -+ * -+ * Initializes all powerdomain and clockdomain target states -+ * and all PRCM settings. -+ * Return: Returns the error code returned by called functions. -+ */ -+int __init omap4_pm_init(void) -+{ -+ int ret = 0; -+ -+ if (omap_rev() == OMAP4430_REV_ES1_0) { -+ WARN(1, "Power Management not supported on OMAP4430 ES1.0\n"); -+ return -ENODEV; -+ } -+ -+ pr_info("Power Management for TI OMAP4+ devices.\n"); -+ -+ ret = pwrdm_for_each(pwrdms_setup, NULL); -+ if (ret) { -+ pr_err("Failed to setup powerdomains.\n"); - goto err2; - } - -+ if (cpu_is_omap44xx()) { -+ ret = omap4_init_static_deps(); -+ if (ret) -+ goto err2; -+ } -+ - ret = omap4_mpuss_init(); - if (ret) { - pr_err("Failed to initialise OMAP4 MPUSS\n"); -@@ -206,7 +243,8 @@ int __init omap4_pm_init(void) - /* Overwrite the default cpu_do_idle() */ - arm_pm_idle = omap_default_idle; - -- omap4_idle_init(); -+ if (cpu_is_omap44xx()) -+ omap4_idle_init(); - - err2: - return ret; --- -1.7.9.5 diff --git a/a/content_digest b/N1/content_digest index 51e9aa9..498e512 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,10 @@ "ref\01365166743-5940-1-git-send-email-santosh.shilimkar@ti.com\0" "ref\087mwtck0i6.fsf@linaro.org\0" - "From\0Santosh Shilimkar <santosh.shilimkar@ti.com>\0" - "Subject\0Re: [PATCH v3 0/4] ARM: OMAP4+: PM: Consolidate code for re-use on OMAP5\0" + "From\0santosh.shilimkar@ti.com (Santosh Shilimkar)\0" + "Subject\0[PATCH v3 0/4] ARM: OMAP4+: PM: Consolidate code for re-use on OMAP5\0" "Date\0Mon, 8 Apr 2013 16:33:53 +0530\0" - "To\0Kevin Hilman <khilman@linaro.org>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - " tony@atomide.com\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "On Saturday 06 April 2013 05:12 AM, Kevin Hilman wrote:\n" "> Santosh Shilimkar <santosh.shilimkar@ti.com> writes:\n" @@ -171,148 +168,15 @@ " err2:\n" " \treturn ret;\n" "-- \n" - 1.7.9.5 - "\01:2\0" - "fn\00001-ARM-OMAP4-PM-Consolidate-OMAP4-PM-code-to-re-use-it-.patch\0" - "b\0" - ">From 428289ddf30a6a34f7e459720e5f6bf59ce4fe63 Mon Sep 17 00:00:00 2001\n" - "From: Santosh Shilimkar <santosh.shilimkar@ti.com>\n" - "Date: Thu, 12 Apr 2012 16:51:47 +0530\n" - "Subject: [PATCH] ARM: OMAP4+: PM: Consolidate OMAP4 PM code to re-use it for\n" - " OMAP5\n" - "\n" - "OMAP5 has backward compatible PRCM block and it's programming\n" - "model is mostly similar to OMAP4. Same is going to be maintained\n" - "for future OMAP4 based SOCs. Hence consolidate the OMAP4 power\n" - "management code so that it can be re-used on OMAP5 and later devices.\n" + "1.7.9.5\n" "\n" - "While at it, update the kernel-doc for omap4_pm_init().\n" - "\n" - "Acked-by: Nishanth Menon <nm@ti.com>\n" - "Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>\n" - "---\n" - " arch/arm/mach-omap2/pm44xx.c | 58 ++++++++++++++++++++++++++++++++++--------\n" - " 1 file changed, 48 insertions(+), 10 deletions(-)\n" "\n" - "diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c\n" - "index 5ba6d88..228deca 100644\n" - "--- a/arch/arm/mach-omap2/pm44xx.c\n" - "+++ b/arch/arm/mach-omap2/pm44xx.c\n" - "@@ -1,7 +1,7 @@\n" - " /*\n" - "- * OMAP4 Power Management Routines\n" - "+ * OMAP4+ Power Management Routines\n" - " *\n" - "- * Copyright (C) 2010-2011 Texas Instruments, Inc.\n" - "+ * Copyright (C) 2010-2013 Texas Instruments, Inc.\n" - " * Rajendra Nayak <rnayak@ti.com>\n" - " * Santosh Shilimkar <santosh.shilimkar@ti.com>\n" - " *\n" - "@@ -135,16 +135,16 @@ static void omap_default_idle(void)\n" - " }\n" - " \n" - " /**\n" - "- * omap4_pm_init - Init routine for OMAP4 PM\n" - "+ * omap4_init_static_deps - Add OMAP4 static dependencies\n" - " *\n" - "- * Initializes all powerdomain and clockdomain target states\n" - "- * and all PRCM settings.\n" - "+ * Add needed static clockdomain dependencies on OMAP4 devices.\n" - "+ * Return: 0 on success or 'err' on failures\n" - " */\n" - "-int __init omap4_pm_init(void)\n" - "+static inline int omap4_init_static_deps(void)\n" - " {\n" - "-\tint ret;\n" - " \tstruct clockdomain *emif_clkdm, *mpuss_clkdm, *l3_1_clkdm;\n" - " \tstruct clockdomain *ducati_clkdm, *l3_2_clkdm;\n" - "+\tint ret = 0;\n" - " \n" - " \tif (omap_rev() == OMAP4430_REV_ES1_0) {\n" - " \t\tWARN(1, \"Power Management not supported on OMAP4430 ES1.0\\n\");\n" - "@@ -163,7 +163,7 @@ int __init omap4_pm_init(void)\n" - " \tret = pwrdm_for_each(pwrdms_setup, NULL);\n" - " \tif (ret) {\n" - " \t\tpr_err(\"Failed to setup powerdomains\\n\");\n" - "-\t\tgoto err2;\n" - "+\t\treturn ret;\n" - " \t}\n" - " \n" - " \t/*\n" - "@@ -171,6 +171,10 @@ int __init omap4_pm_init(void)\n" - " \t * MPUSS -> L4_PER/L3_* and DUCATI -> L3_* doesn't work as\n" - " \t * expected. The hardware recommendation is to enable static\n" - " \t * dependencies for these to avoid system lock ups or random crashes.\n" - "+\t * The L4 wakeup depedency is added to workaround the OCP sync hardware\n" - "+\t * BUG with 32K synctimer which lead to incorrect timer value read\n" - "+\t * from the 32K counter. The BUG applies for GPTIMER1 and WDT2 which\n" - "+\t * are part of L4 wakeup clockdomain.\n" - " \t */\n" - " \tmpuss_clkdm = clkdm_lookup(\"mpuss_clkdm\");\n" - " \temif_clkdm = clkdm_lookup(\"l3_emif_clkdm\");\n" - "@@ -179,7 +183,7 @@ int __init omap4_pm_init(void)\n" - " \tducati_clkdm = clkdm_lookup(\"ducati_clkdm\");\n" - " \tif ((!mpuss_clkdm) || (!emif_clkdm) || (!l3_1_clkdm) ||\n" - " \t\t(!l3_2_clkdm) || (!ducati_clkdm))\n" - "-\t\tgoto err2;\n" - "+\t\treturn -EINVAL;\n" - " \n" - " \tret = clkdm_add_wkdep(mpuss_clkdm, emif_clkdm);\n" - " \tret |= clkdm_add_wkdep(mpuss_clkdm, l3_1_clkdm);\n" - "@@ -188,9 +192,42 @@ int __init omap4_pm_init(void)\n" - " \tret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm);\n" - " \tif (ret) {\n" - " \t\tpr_err(\"Failed to add MPUSS -> L3/EMIF/L4PER, DUCATI -> L3 wakeup dependency\\n\");\n" - "+\t\treturn -EINVAL;\n" - "+\t}\n" - "+\n" - "+\treturn ret;\n" - "+}\n" - "+\n" - "+/**\n" - "+ * omap4_pm_init - Init routine for OMAP4+ devices\n" - "+ *\n" - "+ * Initializes all powerdomain and clockdomain target states\n" - "+ * and all PRCM settings.\n" - "+ * Return: Returns the error code returned by called functions.\n" - "+ */\n" - "+int __init omap4_pm_init(void)\n" - "+{\n" - "+\tint ret = 0;\n" - "+\n" - "+\tif (omap_rev() == OMAP4430_REV_ES1_0) {\n" - "+\t\tWARN(1, \"Power Management not supported on OMAP4430 ES1.0\\n\");\n" - "+\t\treturn -ENODEV;\n" - "+\t}\n" - "+\n" - "+\tpr_info(\"Power Management for TI OMAP4+ devices.\\n\");\n" - "+\n" - "+\tret = pwrdm_for_each(pwrdms_setup, NULL);\n" - "+\tif (ret) {\n" - "+\t\tpr_err(\"Failed to setup powerdomains.\\n\");\n" - " \t\tgoto err2;\n" - " \t}\n" - " \n" - "+\tif (cpu_is_omap44xx()) {\n" - "+\t\tret = omap4_init_static_deps();\n" - "+\t\tif (ret)\n" - "+\t\t\tgoto err2;\n" - "+\t}\n" - "+\n" - " \tret = omap4_mpuss_init();\n" - " \tif (ret) {\n" - " \t\tpr_err(\"Failed to initialise OMAP4 MPUSS\\n\");\n" - "@@ -206,7 +243,8 @@ int __init omap4_pm_init(void)\n" - " \t/* Overwrite the default cpu_do_idle() */\n" - " \tarm_pm_idle = omap_default_idle;\n" - " \n" - "-\tomap4_idle_init();\n" - "+\tif (cpu_is_omap44xx())\n" - "+\t\tomap4_idle_init();\n" - " \n" - " err2:\n" - " \treturn ret;\n" - "-- \n" - 1.7.9.5 + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0001-ARM-OMAP4-PM-Consolidate-OMAP4-PM-code-to-re-use-it-.patch\n" + "Type: text/x-patch\n" + "Size: 4344 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130408/ab185ebf/attachment.bin> -5fd6f151f76b79859c2545afe510daf1b7538e4575869180270eccf4a4a3acb0 +6e1707e1f83bf372669aa9fc1f6e14d1e85f98a78d8a8deeb447a8bc6c865246
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.