diff for duplicates of <20130701061340.22064.93012.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 2d46635..ea15bf5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -45,49 +45,49 @@ Signed-off-by: Magnus Damm <damm@opensource.se> clock-frequency = <1300000000>; }; + -+ cpu1: cpu@1 { ++ cpu1: cpu at 1 { + device_type = "cpu"; + compatible = "arm,cortex-a15"; + reg = <1>; + clock-frequency = <1300000000>; + }; + -+ cpu2: cpu@2 { ++ cpu2: cpu at 2 { + device_type = "cpu"; + compatible = "arm,cortex-a15"; + reg = <2>; + clock-frequency = <1300000000>; + }; + -+ cpu3: cpu@3 { ++ cpu3: cpu at 3 { + device_type = "cpu"; + compatible = "arm,cortex-a15"; + reg = <3>; + clock-frequency = <1300000000>; + }; + -+ cpu4: cpu@4 { ++ cpu4: cpu at 4 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x100>; + clock-frequency = <780000000>; + }; + -+ cpu5: cpu@5 { ++ cpu5: cpu at 5 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x101>; + clock-frequency = <780000000>; + }; + -+ cpu6: cpu@6 { ++ cpu6: cpu at 6 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x102>; + clock-frequency = <780000000>; + }; + -+ cpu7: cpu@7 { ++ cpu7: cpu at 7 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x103>; @@ -95,7 +95,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + }; }; - gic: interrupt-controller@f1001000 { + gic: interrupt-controller at f1001000 { --- 0001/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2013-07-01 13:41:31.000000000 +0900 @@ -19,6 +19,7 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2. @@ -235,7 +235,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + __raw_writel(bar | 0x10, p + r8a7790_clst[clst_id].cabar); + + /* enable clocks for cluster */ -+ if (r8a7790_clst[clst_id].use_count++ = 0) { ++ if (r8a7790_clst[clst_id].use_count++ == 0) { + mask = 1 << r8a7790_clst[clst_id].rescnt_bit; + __raw_writel(__raw_readl(p + RESCNT) & ~mask, p + RESCNT); + } @@ -264,7 +264,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + __raw_writel((__raw_readl(carescnt) | mask) | magic, carescnt); + + /* disable clocks for cluster */ -+ if (r8a7790_clst[clst_id].use_count = 1) { ++ if (r8a7790_clst[clst_id].use_count == 1) { + mask = 1 << r8a7790_clst[clst_id].rescnt_bit; + __raw_writel(__raw_readl(p + RESCNT) | mask, p + RESCNT); + } diff --git a/a/content_digest b/N1/content_digest index fc7262d..5d2002e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\020130612100702.6320.35059.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH] ARM: shmobile: r8a7790 SMP prototype v3\0" - "Date\0Mon, 01 Jul 2013 06:13:40 +0000\0" + "Date\0Mon, 01 Jul 2013 15:13:40 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -52,49 +51,49 @@ " \t\t\tclock-frequency = <1300000000>;\n" " \t\t};\n" "+\n" - "+\t\tcpu1: cpu@1 {\n" + "+\t\tcpu1: cpu at 1 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a15\";\n" "+\t\t\treg = <1>;\n" "+\t\t\tclock-frequency = <1300000000>;\n" "+\t\t};\n" "+\n" - "+\t\tcpu2: cpu@2 {\n" + "+\t\tcpu2: cpu at 2 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a15\";\n" "+\t\t\treg = <2>;\n" "+\t\t\tclock-frequency = <1300000000>;\n" "+\t\t};\n" "+\n" - "+\t\tcpu3: cpu@3 {\n" + "+\t\tcpu3: cpu at 3 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a15\";\n" "+\t\t\treg = <3>;\n" "+\t\t\tclock-frequency = <1300000000>;\n" "+\t\t};\n" "+\n" - "+\t\tcpu4: cpu@4 {\n" + "+\t\tcpu4: cpu at 4 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x100>;\n" "+\t\t\tclock-frequency = <780000000>;\n" "+\t\t};\n" "+\n" - "+\t\tcpu5: cpu@5 {\n" + "+\t\tcpu5: cpu at 5 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x101>;\n" "+\t\t\tclock-frequency = <780000000>;\n" "+\t\t};\n" "+\n" - "+\t\tcpu6: cpu@6 {\n" + "+\t\tcpu6: cpu at 6 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x102>;\n" "+\t\t\tclock-frequency = <780000000>;\n" "+\t\t};\n" "+\n" - "+\t\tcpu7: cpu@7 {\n" + "+\t\tcpu7: cpu at 7 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x103>;\n" @@ -102,7 +101,7 @@ "+\t\t};\n" " \t};\n" " \n" - " \tgic: interrupt-controller@f1001000 {\n" + " \tgic: interrupt-controller at f1001000 {\n" "--- 0001/arch/arm/mach-shmobile/Makefile\n" "+++ work/arch/arm/mach-shmobile/Makefile\t2013-07-01 13:41:31.000000000 +0900\n" "@@ -19,6 +19,7 @@ obj-$(CONFIG_ARCH_EMEV2)\t+= setup-emev2.\n" @@ -242,7 +241,7 @@ "+\t__raw_writel(bar | 0x10, p + r8a7790_clst[clst_id].cabar);\n" "+\n" "+\t/* enable clocks for cluster */\n" - "+\tif (r8a7790_clst[clst_id].use_count++ = 0) {\n" + "+\tif (r8a7790_clst[clst_id].use_count++ == 0) {\n" "+\t\tmask = 1 << r8a7790_clst[clst_id].rescnt_bit;\n" "+\t\t__raw_writel(__raw_readl(p + RESCNT) & ~mask, p + RESCNT);\n" "+\t}\n" @@ -271,7 +270,7 @@ "+\t__raw_writel((__raw_readl(carescnt) | mask) | magic, carescnt);\n" "+\n" "+\t/* disable clocks for cluster */\n" - "+\tif (r8a7790_clst[clst_id].use_count = 1) {\n" + "+\tif (r8a7790_clst[clst_id].use_count == 1) {\n" "+\t\tmask = 1 << r8a7790_clst[clst_id].rescnt_bit;\n" "+\t\t__raw_writel(__raw_readl(p + RESCNT) | mask, p + RESCNT);\n" "+\t}\n" @@ -343,4 +342,4 @@ "+\t.smp_boot_secondary\t= r8a7790_boot_secondary,\n" +}; -d49b1316b104ac2039d10e9a23086e2b4a33d36a532eb493b27d032f0bdaedf4 +f8d94b3bbc9111a4eb662e6b1ba60fea42e3658ecffe97570417380178f780c4
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.