diff for duplicates of <20130717204918.30125.40588.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index f5457c7..7b94648 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -52,49 +52,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>; @@ -102,7 +102,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-18 05:35:38.000000000 +0900 @@ -19,6 +19,7 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2. diff --git a/a/content_digest b/N1/content_digest index 982629c..461a6dc 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 v5\0" - "Date\0Wed, 17 Jul 2013 20:49:18 +0000\0" + "Date\0Thu, 18 Jul 2013 05:49:18 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -59,49 +58,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" @@ -109,7 +108,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-18 05:35:38.000000000 +0900\n" "@@ -19,6 +19,7 @@ obj-$(CONFIG_ARCH_EMEV2)\t+= setup-emev2.\n" @@ -317,4 +316,4 @@ "+\t.smp_boot_secondary\t= r8a7790_boot_secondary,\n" +}; -4f5d2ce9176052c50045cac1f74bf130e8a7496076559d4ce778251b2a96a783 +e77d67dd7586985ce2f62dbe2ecb4a2e478c23808b021e9158248cc7dbc3e866
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.