diff for duplicates of <4D4AA4CE.2020306@ti.com> diff --git a/a/1.txt b/N1/1.txt index 776e70c..a34c81e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,62 +28,3 @@ Regards, Benoit --- ->From ea148474504429fe5ae94406ea5e39c2847c5e31 Mon Sep 17 00:00:00 2001 -From: Benoit Cousson <b-cousson@ti.com> -Date: Thu, 3 Feb 2011 12:04:03 +0100 -Subject: [PATCH] OMAP4: clockdomain: Fix the CPUx domain name - -The register naming convention for module control inside clock domain is: OMAPXXXX_<partition>_<clock_domain>_<module>_CDOFFS - -Both CPU0 and CPU1 use MPU as module name instead of CPU0 and CPU1. - -Change the name to stick to the convention. - -Signed-off-by: Benoit Cousson <b-cousson@ti.com> -Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> -Cc: Paul Walmsley <paul@pwsan.com> -Cc: Rajendra Nayak <rnayak@ti.com> ---- - arch/arm/mach-omap2/clockdomains44xx_data.c | 4 ++-- - arch/arm/mach-omap2/prcm_mpu44xx.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/mach-omap2/clockdomains44xx_data.c b/arch/arm/mach-omap2/clockdomains44xx_data.c -index 51920fc..db1f442 100644 ---- a/arch/arm/mach-omap2/clockdomains44xx_data.c -+++ b/arch/arm/mach-omap2/clockdomains44xx_data.c -@@ -152,7 +152,7 @@ static struct clockdomain mpu0_44xx_clkdm = { - .pwrdm = { .name = "cpu0_pwrdm" }, - .prcm_partition = OMAP4430_PRCM_MPU_PARTITION, - .cm_inst = OMAP4430_PRCM_MPU_CPU0_INST, -- .clkdm_offs = OMAP4430_PRCM_MPU_CPU0_MPU_CDOFFS, -+ .clkdm_offs = OMAP4430_PRCM_MPU_CPU0_CPU0_CDOFFS, - .flags = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), - }; -@@ -162,7 +162,7 @@ static struct clockdomain mpu1_44xx_clkdm = { - .pwrdm = { .name = "cpu1_pwrdm" }, - .prcm_partition = OMAP4430_PRCM_MPU_PARTITION, - .cm_inst = OMAP4430_PRCM_MPU_CPU1_INST, -- .clkdm_offs = OMAP4430_PRCM_MPU_CPU1_MPU_CDOFFS, -+ .clkdm_offs = OMAP4430_PRCM_MPU_CPU1_CPU1_CDOFFS, - .flags = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), - }; -diff --git a/arch/arm/mach-omap2/prcm_mpu44xx.h b/arch/arm/mach-omap2/prcm_mpu44xx.h -index 3300ff6..d22d1b4 100644 ---- a/arch/arm/mach-omap2/prcm_mpu44xx.h -+++ b/arch/arm/mach-omap2/prcm_mpu44xx.h -@@ -38,8 +38,8 @@ - #define OMAP4430_PRCM_MPU_CPU1_INST 0x0800 - - /* PRCM_MPU clockdomain register offsets (from instance start) */ --#define OMAP4430_PRCM_MPU_CPU0_MPU_CDOFFS 0x0018 --#define OMAP4430_PRCM_MPU_CPU1_MPU_CDOFFS 0x0018 -+#define OMAP4430_PRCM_MPU_CPU0_CPU0_CDOFFS 0x0018 -+#define OMAP4430_PRCM_MPU_CPU1_CPU1_CDOFFS 0x0018 - - - /* --- -1.7.0.4 diff --git a/a/content_digest b/N1/content_digest index 67224d9..ae68638 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,18 +2,10 @@ "ref\01296212688-21951-3-git-send-email-santosh.shilimkar@ti.com\0" "ref\087ipx3mduj.fsf@ti.com\0" "ref\04D4922B9.30501@ti.com\0" - "From\0Cousson, Benoit <b-cousson@ti.com>\0" - "Subject\0Re: [PATCH 2/6] omap4: prcm: Fix the CPUx clockdomain offsets\0" + "From\0b-cousson@ti.com (Cousson, Benoit)\0" + "Subject\0[PATCH 2/6] omap4: prcm: Fix the CPUx clockdomain offsets\0" "Date\0Thu, 3 Feb 2011 13:51:26 +0100\0" - "To\0Hilman" - " Kevin <khilman@ti.com>\0" - "Cc\0Shilimkar" - Santosh <santosh.shilimkar@ti.com> - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - paul@pwsan.com <paul@pwsan.com> - Nayak - Rajendra <rnayak@ti.com> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Kevin,\n" @@ -45,65 +37,6 @@ "Regards,\n" "Benoit\n" "\n" - "---\n" - ">From ea148474504429fe5ae94406ea5e39c2847c5e31 Mon Sep 17 00:00:00 2001\n" - "From: Benoit Cousson <b-cousson@ti.com>\n" - "Date: Thu, 3 Feb 2011 12:04:03 +0100\n" - "Subject: [PATCH] OMAP4: clockdomain: Fix the CPUx domain name\n" - "\n" - "The register naming convention for module control inside clock domain is: OMAPXXXX_<partition>_<clock_domain>_<module>_CDOFFS\n" - "\n" - "Both CPU0 and CPU1 use MPU as module name instead of CPU0 and CPU1.\n" - "\n" - "Change the name to stick to the convention.\n" - "\n" - "Signed-off-by: Benoit Cousson <b-cousson@ti.com>\n" - "Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>\n" - "Cc: Paul Walmsley <paul@pwsan.com>\n" - "Cc: Rajendra Nayak <rnayak@ti.com>\n" - "---\n" - " arch/arm/mach-omap2/clockdomains44xx_data.c | 4 ++--\n" - " arch/arm/mach-omap2/prcm_mpu44xx.h | 4 ++--\n" - " 2 files changed, 4 insertions(+), 4 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-omap2/clockdomains44xx_data.c b/arch/arm/mach-omap2/clockdomains44xx_data.c\n" - "index 51920fc..db1f442 100644\n" - "--- a/arch/arm/mach-omap2/clockdomains44xx_data.c\n" - "+++ b/arch/arm/mach-omap2/clockdomains44xx_data.c\n" - "@@ -152,7 +152,7 @@ static struct clockdomain mpu0_44xx_clkdm = {\n" - " \t.pwrdm\t\t = { .name = \"cpu0_pwrdm\" },\n" - " \t.prcm_partition\t = OMAP4430_PRCM_MPU_PARTITION,\n" - " \t.cm_inst\t = OMAP4430_PRCM_MPU_CPU0_INST,\n" - "-\t.clkdm_offs\t = OMAP4430_PRCM_MPU_CPU0_MPU_CDOFFS,\n" - "+\t.clkdm_offs\t = OMAP4430_PRCM_MPU_CPU0_CPU0_CDOFFS,\n" - " \t.flags\t\t = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,\n" - " \t.omap_chip\t = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - " };\n" - "@@ -162,7 +162,7 @@ static struct clockdomain mpu1_44xx_clkdm = {\n" - " \t.pwrdm\t\t = { .name = \"cpu1_pwrdm\" },\n" - " \t.prcm_partition\t = OMAP4430_PRCM_MPU_PARTITION,\n" - " \t.cm_inst\t = OMAP4430_PRCM_MPU_CPU1_INST,\n" - "-\t.clkdm_offs\t = OMAP4430_PRCM_MPU_CPU1_MPU_CDOFFS,\n" - "+\t.clkdm_offs\t = OMAP4430_PRCM_MPU_CPU1_CPU1_CDOFFS,\n" - " \t.flags\t\t = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,\n" - " \t.omap_chip\t = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - " };\n" - "diff --git a/arch/arm/mach-omap2/prcm_mpu44xx.h b/arch/arm/mach-omap2/prcm_mpu44xx.h\n" - "index 3300ff6..d22d1b4 100644\n" - "--- a/arch/arm/mach-omap2/prcm_mpu44xx.h\n" - "+++ b/arch/arm/mach-omap2/prcm_mpu44xx.h\n" - "@@ -38,8 +38,8 @@\n" - " #define OMAP4430_PRCM_MPU_CPU1_INST\t\t0x0800\n" - " \n" - " /* PRCM_MPU clockdomain register offsets (from instance start) */\n" - "-#define OMAP4430_PRCM_MPU_CPU0_MPU_CDOFFS\t0x0018\n" - "-#define OMAP4430_PRCM_MPU_CPU1_MPU_CDOFFS\t0x0018\n" - "+#define OMAP4430_PRCM_MPU_CPU0_CPU0_CDOFFS\t0x0018\n" - "+#define OMAP4430_PRCM_MPU_CPU1_CPU1_CDOFFS\t0x0018\n" - " \n" - " \n" - " /*\n" - "-- \n" - 1.7.0.4 + --- -df6b1e87f992a22352c641562898be75eb9ee5f351c57c1c9d02486db4d1534a +5868ae8fb5e15a59d88071ad56048090126c80c5b7609ad70fd21ef0d7ed7b80
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.