diff for duplicates of <627ff975140c8e4afbad281105b29d35@mail.gmail.com> diff --git a/a/1.txt b/N1/1.txt index 1abab03..c408e6f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,10 +1,10 @@ > -----Original Message----- -> From: Russell King - ARM Linux [mailto:linux@arm.linux.org.uk] +> From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk] > Sent: Tuesday, January 25, 2011 6:36 PM > To: Santosh Shilimkar -> Cc: catalin.marinas@arm.com; linus.ml.walleij@gmail.com; linux- -> omap@vger.kernel.org; linux-arm-kernel@lists.infradead.org; -> ccross@android.com +> Cc: catalin.marinas at arm.com; linus.ml.walleij at gmail.com; linux- +> omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org; +> ccross at android.com > Subject: Re: [PATCH 4/5] ARM: scu: Move register defines to header > file > @@ -100,3 +100,10 @@ index ee7bf47..aec7c5d 100644 +} -- 1.6.0.4 +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0001-4th-revision.patch +Type: application/octet-stream +Size: 1898 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110125/21404ae7/attachment.obj> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 652fe20..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,4 +0,0 @@ -Content-Type: application/octet-stream; name="0001-4th-revision.patch" -Content-Disposition: attachment; filename="0001-4th-revision.patch" -Content-Transfer-Encoding: base64 -X-Attachment-Id: 86ad572624c9c85c_0.1 diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index a3be4a5..0000000 --- a/a/2.txt +++ /dev/null @@ -1,77 +0,0 @@ -4th revision - ---- - arch/arm/include/asm/smp_scu.h | 5 +++++ - arch/arm/kernel/smp_scu.c | 23 +++++++++++++++++++++-- - 2 files changed, 26 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/include/asm/smp_scu.h b/arch/arm/include/asm/smp_scu.h -index b6f42c9..676bc43 100644 ---- a/arch/arm/include/asm/smp_scu.h -+++ b/arch/arm/include/asm/smp_scu.h -@@ -7,7 +7,12 @@ - #define SCU_INVALIDATE 0x0c - #define SCU_FPGA_REVISION 0x10 - -+#define SCU_PM_NORMAL 0 -+#define SCU_PM_DORMANT 2 -+#define SCU_PM_POWEROFF 3 -+ - unsigned int scu_get_core_count(void __iomem *); - void scu_enable(void __iomem *); -+int scu_power_mode(unsigned int); - - #endif -diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c -index ee7bf47..aec7c5d 100644 ---- a/arch/arm/kernel/smp_scu.c -+++ b/arch/arm/kernel/smp_scu.c -@@ -14,6 +14,8 @@ - #include <asm/smp_scu.h> - #include <asm/cacheflush.h> - -+static void __iomem *base; -+ - /* - * Get the number of CPU cores from the SCU configuration - */ -@@ -29,14 +31,15 @@ unsigned int __init scu_get_core_count(void __iomem *scu_base) - void __init scu_enable(void __iomem *scu_base) - { - u32 scu_ctrl; -+ base = scu_base; - -- scu_ctrl = __raw_readl(scu_base + SCU_CTRL); -+ scu_ctrl = __raw_readl(base + SCU_CTRL); - /* already enabled? */ - if (scu_ctrl & 1) - return; - - scu_ctrl |= 1; -- __raw_writel(scu_ctrl, scu_base + SCU_CTRL); -+ __raw_writel(scu_ctrl, base + SCU_CTRL); - - /* - * Ensure that the data accessed by CPU0 before the SCU was -@@ -44,3 +47,19 @@ void __init scu_enable(void __iomem *scu_base) - */ - flush_cache_all(); - } -+ -+int scu_power_mode(unsigned int mode) -+{ -+ unsigned int val; -+ int cpu = smp_processor_id(); -+ int shift; -+ -+ if (mode > 3 || mode == 1 || cpu > 3) -+ return -EINVAL; -+ -+ val = __raw_readb(base + SCU_CPU_STATUS + cpu) & ~0x03; -+ val |= mode; -+ __raw_writeb(val, base + SCU_CPU_STATUS + cpu); -+ -+ return 0; -+} --- -1.6.0.4 diff --git a/a/content_digest b/N1/content_digest index b7dbd6b..038831f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,24 +7,19 @@ "ref\020110125125656.GG13300@n2100.arm.linux.org.uk\0" "ref\020110125130422.GH13300@n2100.arm.linux.org.uk\0" "ref\020110125130611.GA15663@n2100.arm.linux.org.uk\0" - "From\0Santosh Shilimkar <santosh.shilimkar@ti.com>\0" - "Subject\0RE: [PATCH 4/5] ARM: scu: Move register defines to header file\0" + "From\0santosh.shilimkar@ti.com (Santosh Shilimkar)\0" + "Subject\0[PATCH 4/5] ARM: scu: Move register defines to header file\0" "Date\0Tue, 25 Jan 2011 23:53:35 +0530\0" - "To\0Russell King - ARM Linux <linux@arm.linux.org.uk>\0" - "Cc\0catalin.marinas@arm.com" - linus.ml.walleij@gmail.com - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " ccross@android.com\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "> -----Original Message-----\n" - "> From: Russell King - ARM Linux [mailto:linux@arm.linux.org.uk]\n" + "> From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk]\n" "> Sent: Tuesday, January 25, 2011 6:36 PM\n" "> To: Santosh Shilimkar\n" - "> Cc: catalin.marinas@arm.com; linus.ml.walleij@gmail.com; linux-\n" - "> omap@vger.kernel.org; linux-arm-kernel@lists.infradead.org;\n" - "> ccross@android.com\n" + "> Cc: catalin.marinas at arm.com; linus.ml.walleij at gmail.com; linux-\n" + "> omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org;\n" + "> ccross at android.com\n" "> Subject: Re: [PATCH 4/5] ARM: scu: Move register defines to header\n" "> file\n" ">\n" @@ -119,86 +114,13 @@ "+\treturn 0;\n" "+}\n" "-- \n" - 1.6.0.4 - "\01:2\0" - "fn\00001-4th-revision.patch\0" - "b\0" - "4th revision\n" - "\n" - "---\n" - " arch/arm/include/asm/smp_scu.h | 5 +++++\n" - " arch/arm/kernel/smp_scu.c | 23 +++++++++++++++++++++--\n" - " 2 files changed, 26 insertions(+), 2 deletions(-)\n" - "\n" - "diff --git a/arch/arm/include/asm/smp_scu.h b/arch/arm/include/asm/smp_scu.h\n" - "index b6f42c9..676bc43 100644\n" - "--- a/arch/arm/include/asm/smp_scu.h\n" - "+++ b/arch/arm/include/asm/smp_scu.h\n" - "@@ -7,7 +7,12 @@\n" - " #define SCU_INVALIDATE\t\t0x0c\n" - " #define SCU_FPGA_REVISION\t0x10\n" - " \n" - "+#define SCU_PM_NORMAL\t0\n" - "+#define SCU_PM_DORMANT\t2\n" - "+#define SCU_PM_POWEROFF\t3\n" - "+\n" - " unsigned int scu_get_core_count(void __iomem *);\n" - " void scu_enable(void __iomem *);\n" - "+int scu_power_mode(unsigned int);\n" - " \n" - " #endif\n" - "diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c\n" - "index ee7bf47..aec7c5d 100644\n" - "--- a/arch/arm/kernel/smp_scu.c\n" - "+++ b/arch/arm/kernel/smp_scu.c\n" - "@@ -14,6 +14,8 @@\n" - " #include <asm/smp_scu.h>\n" - " #include <asm/cacheflush.h>\n" - " \n" - "+static void __iomem *base;\n" - "+\n" - " /*\n" - " * Get the number of CPU cores from the SCU configuration\n" - " */\n" - "@@ -29,14 +31,15 @@ unsigned int __init scu_get_core_count(void __iomem *scu_base)\n" - " void __init scu_enable(void __iomem *scu_base)\n" - " {\n" - " \tu32 scu_ctrl;\n" - "+\tbase = scu_base;\n" - " \n" - "-\tscu_ctrl = __raw_readl(scu_base + SCU_CTRL);\n" - "+\tscu_ctrl = __raw_readl(base + SCU_CTRL);\n" - " \t/* already enabled? */\n" - " \tif (scu_ctrl & 1)\n" - " \t\treturn;\n" - " \n" - " \tscu_ctrl |= 1;\n" - "-\t__raw_writel(scu_ctrl, scu_base + SCU_CTRL);\n" - "+\t__raw_writel(scu_ctrl, base + SCU_CTRL);\n" - " \n" - " \t/*\n" - " \t * Ensure that the data accessed by CPU0 before the SCU was\n" - "@@ -44,3 +47,19 @@ void __init scu_enable(void __iomem *scu_base)\n" - " \t */\n" - " \tflush_cache_all();\n" - " }\n" - "+\n" - "+int scu_power_mode(unsigned int mode)\n" - "+{\n" - "+\tunsigned int val;\n" - "+\tint cpu = smp_processor_id();\n" - "+\tint shift;\n" - "+\n" - "+\tif (mode > 3 || mode == 1 || cpu > 3)\n" - "+\t\treturn -EINVAL;\n" - "+\n" - "+\tval = __raw_readb(base + SCU_CPU_STATUS + cpu) & ~0x03;\n" - "+\tval |= mode;\n" - "+\t__raw_writeb(val, base + SCU_CPU_STATUS + cpu);\n" - "+\n" - "+\treturn 0;\n" - "+}\n" - "-- \n" - 1.6.0.4 + "1.6.0.4\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0001-4th-revision.patch\n" + "Type: application/octet-stream\n" + "Size: 1898 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110125/21404ae7/attachment.obj> -848f0085d9e7cf47970dcb8349915c5888367c6b2e55e60dff4ce95018dab9e2 +158c6a7cdeac1e27b64abb91c7a808139eb3d9b92a4c0219e923e4779d974a29
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.