diff for duplicates of <20140220000101.3595.13281.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index beb5b65..6223a8a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se> + cci-control-port = <&cci_control1>; }; - cpu1: cpu@1 { + cpu1: cpu at 1 { @@ -41,6 +42,7 @@ compatible = "arm,cortex-a15"; reg = <1>; @@ -33,7 +33,7 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se> + cci-control-port = <&cci_control1>; }; - cpu2: cpu@2 { + cpu2: cpu at 2 { @@ -48,6 +50,7 @@ compatible = "arm,cortex-a15"; reg = <2>; @@ -41,7 +41,7 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se> + cci-control-port = <&cci_control1>; }; - cpu3: cpu@3 { + cpu3: cpu at 3 { @@ -55,6 +58,7 @@ compatible = "arm,cortex-a15"; reg = <3>; @@ -49,7 +49,7 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se> + cci-control-port = <&cci_control1>; }; - cpu4: cpu@4 { + cpu4: cpu at 4 { @@ -62,6 +66,7 @@ compatible = "arm,cortex-a7"; reg = <0x100>; @@ -57,7 +57,7 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se> + cci-control-port = <&cci_control2>; }; - cpu5: cpu@5 { + cpu5: cpu at 5 { @@ -69,6 +74,7 @@ compatible = "arm,cortex-a7"; reg = <0x101>; @@ -65,7 +65,7 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se> + cci-control-port = <&cci_control2>; }; - cpu6: cpu@6 { + cpu6: cpu at 6 { @@ -76,6 +82,7 @@ compatible = "arm,cortex-a7"; reg = <0x102>; @@ -73,7 +73,7 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se> + cci-control-port = <&cci_control2>; }; - cpu7: cpu@7 { + cpu7: cpu at 7 { @@ -83,6 +90,7 @@ compatible = "arm,cortex-a7"; reg = <0x103>; @@ -86,27 +86,27 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se> interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; -+ cci@f0090000 { ++ cci at f0090000 { + compatible = "arm,cci-400"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0 0xf0090000 0 0x1000>; + ranges = <0x0 0x0 0xf0090000 0x10000>; + -+ cci_control1: slave-if@4000 { ++ cci_control1: slave-if at 4000 { + compatible = "arm,cci-400-ctrl-if"; + interface-type = "ace"; + reg = <0x4000 0x1000>; + }; + -+ cci_control2: slave-if@5000 { ++ cci_control2: slave-if at 5000 { + compatible = "arm,cci-400-ctrl-if"; + interface-type = "ace"; + reg = <0x5000 0x1000>; + }; + }; + - gpio0: gpio@e6050000 { + gpio0: gpio at e6050000 { compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; reg = <0 0xe6050000 0 0x50>; --- 0001/arch/arm/mach-shmobile/Kconfig diff --git a/a/content_digest b/N1/content_digest index 10629c8..4733982 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH] ARM: shmobile: MCPM and CCI prototype\0" - "Date\0Wed, 19 Feb 2014 23:59:50 +0000\0" + "Date\0Thu, 20 Feb 2014 09:01:01 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -31,7 +31,7 @@ "+\t\t\tcci-control-port = <&cci_control1>;\n" " \t\t};\n" " \n" - " \t\tcpu1: cpu@1 {\n" + " \t\tcpu1: cpu at 1 {\n" "@@ -41,6 +42,7 @@\n" " \t\t\tcompatible = \"arm,cortex-a15\";\n" " \t\t\treg = <1>;\n" @@ -39,7 +39,7 @@ "+\t\t\tcci-control-port = <&cci_control1>;\n" " \t\t};\n" " \n" - " \t\tcpu2: cpu@2 {\n" + " \t\tcpu2: cpu at 2 {\n" "@@ -48,6 +50,7 @@\n" " \t\t\tcompatible = \"arm,cortex-a15\";\n" " \t\t\treg = <2>;\n" @@ -47,7 +47,7 @@ "+\t\t\tcci-control-port = <&cci_control1>;\n" " \t\t};\n" " \n" - " \t\tcpu3: cpu@3 {\n" + " \t\tcpu3: cpu at 3 {\n" "@@ -55,6 +58,7 @@\n" " \t\t\tcompatible = \"arm,cortex-a15\";\n" " \t\t\treg = <3>;\n" @@ -55,7 +55,7 @@ "+\t\t\tcci-control-port = <&cci_control1>;\n" " \t\t};\n" " \n" - " \t\tcpu4: cpu@4 {\n" + " \t\tcpu4: cpu at 4 {\n" "@@ -62,6 +66,7 @@\n" " \t\t\tcompatible = \"arm,cortex-a7\";\n" " \t\t\treg = <0x100>;\n" @@ -63,7 +63,7 @@ "+\t\t\tcci-control-port = <&cci_control2>;\n" " \t\t};\n" " \n" - " \t\tcpu5: cpu@5 {\n" + " \t\tcpu5: cpu at 5 {\n" "@@ -69,6 +74,7 @@\n" " \t\t\tcompatible = \"arm,cortex-a7\";\n" " \t\t\treg = <0x101>;\n" @@ -71,7 +71,7 @@ "+\t\t\tcci-control-port = <&cci_control2>;\n" " \t\t};\n" " \n" - " \t\tcpu6: cpu@6 {\n" + " \t\tcpu6: cpu at 6 {\n" "@@ -76,6 +82,7 @@\n" " \t\t\tcompatible = \"arm,cortex-a7\";\n" " \t\t\treg = <0x102>;\n" @@ -79,7 +79,7 @@ "+\t\t\tcci-control-port = <&cci_control2>;\n" " \t\t};\n" " \n" - " \t\tcpu7: cpu@7 {\n" + " \t\tcpu7: cpu at 7 {\n" "@@ -83,6 +90,7 @@\n" " \t\t\tcompatible = \"arm,cortex-a7\";\n" " \t\t\treg = <0x103>;\n" @@ -92,27 +92,27 @@ " \t\tinterrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;\n" " \t};\n" " \n" - "+\tcci@f0090000 {\n" + "+\tcci at f0090000 {\n" "+\t\tcompatible = \"arm,cci-400\";\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" "+\t\treg = <0 0xf0090000 0 0x1000>;\n" "+\t\tranges = <0x0 0x0 0xf0090000 0x10000>;\n" "+\n" - "+\t\tcci_control1: slave-if@4000 {\n" + "+\t\tcci_control1: slave-if at 4000 {\n" "+\t\t\tcompatible = \"arm,cci-400-ctrl-if\";\n" "+\t\t\tinterface-type = \"ace\";\n" "+\t\t\treg = <0x4000 0x1000>;\n" "+\t\t};\n" "+\n" - "+\t\tcci_control2: slave-if@5000 {\n" + "+\t\tcci_control2: slave-if at 5000 {\n" "+\t\t\tcompatible = \"arm,cci-400-ctrl-if\";\n" "+\t\t\tinterface-type = \"ace\";\n" "+\t\t\treg = <0x5000 0x1000>;\n" "+\t\t};\n" "+\t};\n" "+\n" - " \tgpio0: gpio@e6050000 {\n" + " \tgpio0: gpio at e6050000 {\n" " \t\tcompatible = \"renesas,gpio-r8a7790\", \"renesas,gpio-rcar\";\n" " \t\treg = <0 0xe6050000 0 0x50>;\n" "--- 0001/arch/arm/mach-shmobile/Kconfig\n" @@ -314,4 +314,4 @@ " \n" #ifdef CONFIG_HOTPLUG_CPU -76ace18459382577161fa7d3e38af01660c220f4ecc0cf9f24aa20ba6641958a +44969361754e1fdce844211835eeaf44e43b7bb86fadd6976ea51c7c81094cdd
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.