diff for duplicates of <20110126044427.16410.89126.stgit@localhost6.localdomain6> diff --git a/a/1.txt b/N1/1.txt index 74955cf..853a8bd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,13 +53,13 @@ index 0000000..6ff9ee2 + #address-cells = <1>; + #size-cells = <0>; + -+ ref24_clk: clock at 0 { ++ ref24_clk: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-outputs = "ref"; + }; + -+ osc4_clk: clock at 1 { ++ osc4_clk: clock@1 { + compatible = "ics,icst307"; + ref = <24000>; + vco-max = <200000>; @@ -76,7 +76,7 @@ index 0000000..6ff9ee2 + reg = <0x10140000 0x1000>; + }; + -+ sic: intc at 10003000 { ++ sic: intc@10003000 { + compatible = "arm,versatile-vic"; + interrupt-controller; + #interrupt-cells = <1>; @@ -96,29 +96,29 @@ index 0000000..6ff9ee2 + #size-cells = <1>; + ranges = <0 0x10000000 0x10000>; + -+ fpga at 5000 { ++ fpga@5000 { + compatible = "arm,amba-device"; + reg = < 0x5000 0x1000 >; + }; -+ fpga at 6000 { ++ fpga@6000 { + compatible = "arm,pl050", "arm,amba-device"; + reg = < 0x6000 0x1000 >; + }; -+ fpga at 7000 { ++ fpga@7000 { + compatible = "arm,pl050", "arm,amba-device"; + reg = < 0x7000 0x1000 >; + }; -+ fpga at 9000 { ++ fpga@9000 { + compatible = "arm,pl011", "arm,amba-device"; + reg = < 0x9000 0x1000 >; + }; -+ fpga at b000 { ++ fpga@b000 { + compatible = "arm,amba-device"; + reg = < 0xb000 0x1000 >; + }; + }; + -+ uart0: uart at 101f1000 { ++ uart0: uart@101f1000 { + compatible = "arm,pl011", "arm,amba-device"; + reg = <0x101f1000 0x1000>; + arm,amba-deviceid = <0x00141011>; @@ -126,7 +126,7 @@ index 0000000..6ff9ee2 + bus-clock = <&ref24_clk>, "ref"; + }; + -+ uart1: uart at 101f2000 { ++ uart1: uart@101f2000 { + compatible = "arm,pl011", "arm,amba-device"; + reg = <0x101f2000 0x1000>; + arm,amba-deviceid = <0x00141011>; @@ -135,31 +135,31 @@ index 0000000..6ff9ee2 + }; + }; + -+ flash at 34000000 { ++ flash@34000000 { + compatible = "arm,versatile-flash"; + reg = <0x34000000 0x4000000>; + bank-width = <4>; + }; + -+ net at 10010000 { ++ net@10010000 { + compatible = "smsc,smc91c111"; + reg = <0x10010000 0x10000>; + interrupts = <25>; + }; + -+ i2c at 10002000 { ++ i2c@10002000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "arm,versatile-i2c"; + reg = <0x10002000 0x1000>; + -+ rtc at 68 { ++ rtc@68 { + compatible = "dallas,ds1338"; + reg = <0x68>; + }; + }; + -+ lcd at 10008000 { ++ lcd@10008000 { + compatible = "arm,versatile-lcd"; + reg = <0x10008000 0x1000>; + }; diff --git a/a/content_digest b/N1/content_digest index e4e46c9..f0c74d1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,12 @@ "ref\020110126043338.16410.75019.stgit@localhost6.localdomain6\0" - "From\0grant.likely@secretlab.ca (Grant Likely)\0" + "From\0Grant Likely <grant.likely@secretlab.ca>\0" "Subject\0[RFC PATCH 5/5] arm/versatile: add a device tree versatile platform\0" "Date\0Tue, 25 Jan 2011 21:44:27 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree-discuss@lists.ozlabs.org" + jeremy.kerr@canonical.com + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0nicolas.pitre@linaro.org\0" "\00:1\0" "b\0" "For testing the dt work, define a dt-enabled versatile platform.\n" @@ -60,13 +64,13 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\tref24_clk: clock at 0 {\n" + "+\t\tref24_clk: clock@0 {\n" "+\t\t\tcompatible = \"fixed-clock\";\n" "+\t\t\tclock-frequency = <24000000>;\n" "+\t\t\tclock-outputs = \"ref\";\n" "+\t\t};\n" "+\n" - "+\t\tosc4_clk: clock at 1 {\n" + "+\t\tosc4_clk: clock@1 {\n" "+\t\t\tcompatible = \"ics,icst307\";\n" "+\t\t\tref = <24000>;\n" "+\t\t\tvco-max = <200000>;\n" @@ -83,7 +87,7 @@ "+\t\treg = <0x10140000 0x1000>;\n" "+\t};\n" "+\n" - "+\tsic: intc at 10003000 {\n" + "+\tsic: intc@10003000 {\n" "+\t\tcompatible = \"arm,versatile-vic\";\n" "+\t\tinterrupt-controller;\n" "+\t\t#interrupt-cells = <1>;\n" @@ -103,29 +107,29 @@ "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges = <0 0x10000000 0x10000>;\n" "+\n" - "+\t\t\tfpga at 5000 {\n" + "+\t\t\tfpga@5000 {\n" "+\t\t\t\tcompatible = \"arm,amba-device\";\n" "+\t\t\t\treg = < 0x5000 0x1000 >;\n" "+\t\t\t};\n" - "+\t\t\tfpga at 6000 {\n" + "+\t\t\tfpga@6000 {\n" "+\t\t\t\tcompatible = \"arm,pl050\", \"arm,amba-device\";\n" "+\t\t\t\treg = < 0x6000 0x1000 >;\n" "+\t\t\t};\n" - "+\t\t\tfpga at 7000 {\n" + "+\t\t\tfpga@7000 {\n" "+\t\t\t\tcompatible = \"arm,pl050\", \"arm,amba-device\";\n" "+\t\t\t\treg = < 0x7000 0x1000 >;\n" "+\t\t\t};\n" - "+\t\t\tfpga at 9000 {\n" + "+\t\t\tfpga@9000 {\n" "+\t\t\t\tcompatible = \"arm,pl011\", \"arm,amba-device\";\n" "+\t\t\t\treg = < 0x9000 0x1000 >;\n" "+\t\t\t};\n" - "+\t\t\tfpga at b000 {\n" + "+\t\t\tfpga@b000 {\n" "+\t\t\t\tcompatible = \"arm,amba-device\";\n" "+\t\t\t\treg = < 0xb000 0x1000 >;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tuart0: uart at 101f1000 {\n" + "+\t\tuart0: uart@101f1000 {\n" "+\t\t\tcompatible = \"arm,pl011\", \"arm,amba-device\";\n" "+\t\t\treg = <0x101f1000 0x1000>;\n" "+\t\t\tarm,amba-deviceid = <0x00141011>;\n" @@ -133,7 +137,7 @@ "+\t\t\tbus-clock = <&ref24_clk>, \"ref\";\n" "+\t\t};\n" "+\n" - "+\t\tuart1: uart at 101f2000 {\n" + "+\t\tuart1: uart@101f2000 {\n" "+\t\t\tcompatible = \"arm,pl011\", \"arm,amba-device\";\n" "+\t\t\treg = <0x101f2000 0x1000>;\n" "+\t\t\tarm,amba-deviceid = <0x00141011>;\n" @@ -142,31 +146,31 @@ "+\t\t};\n" "+\t};\n" "+\n" - "+\tflash at 34000000 {\n" + "+\tflash@34000000 {\n" "+\t\tcompatible = \"arm,versatile-flash\";\n" "+\t\treg = <0x34000000 0x4000000>;\n" "+\t\tbank-width = <4>;\n" "+\t};\n" "+\n" - "+\tnet at 10010000 {\n" + "+\tnet@10010000 {\n" "+\t\tcompatible = \"smsc,smc91c111\";\n" "+\t\treg = <0x10010000 0x10000>;\n" "+\t\tinterrupts = <25>;\n" "+\t};\n" "+\n" - "+\ti2c at 10002000 {\n" + "+\ti2c@10002000 {\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\t\tcompatible = \"arm,versatile-i2c\";\n" "+\t\treg = <0x10002000 0x1000>;\n" "+\n" - "+\t\trtc at 68 {\n" + "+\t\trtc@68 {\n" "+\t\t\tcompatible = \"dallas,ds1338\";\n" "+\t\t\treg = <0x68>;\n" "+\t\t};\n" "+\t};\n" "+\n" - "+\tlcd at 10008000 {\n" + "+\tlcd@10008000 {\n" "+\t\tcompatible = \"arm,versatile-lcd\";\n" "+\t\treg = <0x10008000 0x1000>;\n" "+\t};\n" @@ -379,4 +383,4 @@ " }\n" - -8dec40a5bba063ede1add95af1c2f99b6d99302f2faa2a6b21219f71784df7b5 +c42172e200cc45365c54bad3012c978fb4f4b8eb9fb215303a902c518ba0a653
diff --git a/a/1.txt b/N2/1.txt index 74955cf..fd8c80a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -5,8 +5,8 @@ better as common code, but that depends on the common struct clk getting merged. In the mean time it is easy enough to implement it here. -Based on work originally written by Jeremy Kerr <jeremy.kerr@canonical.com> -Signed-off-by: Grant Likely <grant.likely@secretlab.ca> +Based on work originally written by Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> +Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> --- arch/arm/boot/dts/versatile.dts | 138 ++++++++++++++++++++++++++++++++ arch/arm/mach-versatile/Kconfig | 8 ++ @@ -53,13 +53,13 @@ index 0000000..6ff9ee2 + #address-cells = <1>; + #size-cells = <0>; + -+ ref24_clk: clock at 0 { ++ ref24_clk: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-outputs = "ref"; + }; + -+ osc4_clk: clock at 1 { ++ osc4_clk: clock@1 { + compatible = "ics,icst307"; + ref = <24000>; + vco-max = <200000>; @@ -76,7 +76,7 @@ index 0000000..6ff9ee2 + reg = <0x10140000 0x1000>; + }; + -+ sic: intc at 10003000 { ++ sic: intc@10003000 { + compatible = "arm,versatile-vic"; + interrupt-controller; + #interrupt-cells = <1>; @@ -96,29 +96,29 @@ index 0000000..6ff9ee2 + #size-cells = <1>; + ranges = <0 0x10000000 0x10000>; + -+ fpga at 5000 { ++ fpga@5000 { + compatible = "arm,amba-device"; + reg = < 0x5000 0x1000 >; + }; -+ fpga at 6000 { ++ fpga@6000 { + compatible = "arm,pl050", "arm,amba-device"; + reg = < 0x6000 0x1000 >; + }; -+ fpga at 7000 { ++ fpga@7000 { + compatible = "arm,pl050", "arm,amba-device"; + reg = < 0x7000 0x1000 >; + }; -+ fpga at 9000 { ++ fpga@9000 { + compatible = "arm,pl011", "arm,amba-device"; + reg = < 0x9000 0x1000 >; + }; -+ fpga at b000 { ++ fpga@b000 { + compatible = "arm,amba-device"; + reg = < 0xb000 0x1000 >; + }; + }; + -+ uart0: uart at 101f1000 { ++ uart0: uart@101f1000 { + compatible = "arm,pl011", "arm,amba-device"; + reg = <0x101f1000 0x1000>; + arm,amba-deviceid = <0x00141011>; @@ -126,7 +126,7 @@ index 0000000..6ff9ee2 + bus-clock = <&ref24_clk>, "ref"; + }; + -+ uart1: uart at 101f2000 { ++ uart1: uart@101f2000 { + compatible = "arm,pl011", "arm,amba-device"; + reg = <0x101f2000 0x1000>; + arm,amba-deviceid = <0x00141011>; @@ -135,31 +135,31 @@ index 0000000..6ff9ee2 + }; + }; + -+ flash at 34000000 { ++ flash@34000000 { + compatible = "arm,versatile-flash"; + reg = <0x34000000 0x4000000>; + bank-width = <4>; + }; + -+ net at 10010000 { ++ net@10010000 { + compatible = "smsc,smc91c111"; + reg = <0x10010000 0x10000>; + interrupts = <25>; + }; + -+ i2c at 10002000 { ++ i2c@10002000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "arm,versatile-i2c"; + reg = <0x10002000 0x1000>; + -+ rtc at 68 { ++ rtc@68 { + compatible = "dallas,ds1338"; + reg = <0x68>; + }; + }; + -+ lcd at 10008000 { ++ lcd@10008000 { + compatible = "arm,versatile-lcd"; + reg = <0x10008000 0x1000>; + }; @@ -222,7 +222,7 @@ index 0000000..7eacc2d +/* + * linux/arch/arm/mach-versatile/versatile_dt.c + * -+ * Copyright (C) 2009 Jeremy Kerr <jeremy.kerr@canonical.com> ++ * Copyright (C) 2009 Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> + * Copyright (C) 2004 ARM Limited + * Copyright (C) 2000 Deep Blue Solutions Ltd + * diff --git a/a/content_digest b/N2/content_digest index e4e46c9..e4c52ec 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,13 @@ "ref\020110126043338.16410.75019.stgit@localhost6.localdomain6\0" - "From\0grant.likely@secretlab.ca (Grant Likely)\0" + "ref\020110126043338.16410.75019.stgit-bi+AKbBUZKagILUCTcTcHdKyNwTtLsGr@public.gmane.org\0" + "From\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" "Subject\0[RFC PATCH 5/5] arm/versatile: add a device tree versatile platform\0" "Date\0Tue, 25 Jan 2011 21:44:27 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" + jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "Cc\0nicolas.pitre-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" "\00:1\0" "b\0" "For testing the dt work, define a dt-enabled versatile platform.\n" @@ -12,8 +17,8 @@ "getting merged. In the mean time it is easy enough to implement it\n" "here.\n" "\n" - "Based on work originally written by Jeremy Kerr <jeremy.kerr@canonical.com>\n" - "Signed-off-by: Grant Likely <grant.likely@secretlab.ca>\n" + "Based on work originally written by Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>\n" + "Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/versatile.dts | 138 ++++++++++++++++++++++++++++++++\n" " arch/arm/mach-versatile/Kconfig | 8 ++\n" @@ -60,13 +65,13 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\tref24_clk: clock at 0 {\n" + "+\t\tref24_clk: clock@0 {\n" "+\t\t\tcompatible = \"fixed-clock\";\n" "+\t\t\tclock-frequency = <24000000>;\n" "+\t\t\tclock-outputs = \"ref\";\n" "+\t\t};\n" "+\n" - "+\t\tosc4_clk: clock at 1 {\n" + "+\t\tosc4_clk: clock@1 {\n" "+\t\t\tcompatible = \"ics,icst307\";\n" "+\t\t\tref = <24000>;\n" "+\t\t\tvco-max = <200000>;\n" @@ -83,7 +88,7 @@ "+\t\treg = <0x10140000 0x1000>;\n" "+\t};\n" "+\n" - "+\tsic: intc at 10003000 {\n" + "+\tsic: intc@10003000 {\n" "+\t\tcompatible = \"arm,versatile-vic\";\n" "+\t\tinterrupt-controller;\n" "+\t\t#interrupt-cells = <1>;\n" @@ -103,29 +108,29 @@ "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges = <0 0x10000000 0x10000>;\n" "+\n" - "+\t\t\tfpga at 5000 {\n" + "+\t\t\tfpga@5000 {\n" "+\t\t\t\tcompatible = \"arm,amba-device\";\n" "+\t\t\t\treg = < 0x5000 0x1000 >;\n" "+\t\t\t};\n" - "+\t\t\tfpga at 6000 {\n" + "+\t\t\tfpga@6000 {\n" "+\t\t\t\tcompatible = \"arm,pl050\", \"arm,amba-device\";\n" "+\t\t\t\treg = < 0x6000 0x1000 >;\n" "+\t\t\t};\n" - "+\t\t\tfpga at 7000 {\n" + "+\t\t\tfpga@7000 {\n" "+\t\t\t\tcompatible = \"arm,pl050\", \"arm,amba-device\";\n" "+\t\t\t\treg = < 0x7000 0x1000 >;\n" "+\t\t\t};\n" - "+\t\t\tfpga at 9000 {\n" + "+\t\t\tfpga@9000 {\n" "+\t\t\t\tcompatible = \"arm,pl011\", \"arm,amba-device\";\n" "+\t\t\t\treg = < 0x9000 0x1000 >;\n" "+\t\t\t};\n" - "+\t\t\tfpga at b000 {\n" + "+\t\t\tfpga@b000 {\n" "+\t\t\t\tcompatible = \"arm,amba-device\";\n" "+\t\t\t\treg = < 0xb000 0x1000 >;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tuart0: uart at 101f1000 {\n" + "+\t\tuart0: uart@101f1000 {\n" "+\t\t\tcompatible = \"arm,pl011\", \"arm,amba-device\";\n" "+\t\t\treg = <0x101f1000 0x1000>;\n" "+\t\t\tarm,amba-deviceid = <0x00141011>;\n" @@ -133,7 +138,7 @@ "+\t\t\tbus-clock = <&ref24_clk>, \"ref\";\n" "+\t\t};\n" "+\n" - "+\t\tuart1: uart at 101f2000 {\n" + "+\t\tuart1: uart@101f2000 {\n" "+\t\t\tcompatible = \"arm,pl011\", \"arm,amba-device\";\n" "+\t\t\treg = <0x101f2000 0x1000>;\n" "+\t\t\tarm,amba-deviceid = <0x00141011>;\n" @@ -142,31 +147,31 @@ "+\t\t};\n" "+\t};\n" "+\n" - "+\tflash at 34000000 {\n" + "+\tflash@34000000 {\n" "+\t\tcompatible = \"arm,versatile-flash\";\n" "+\t\treg = <0x34000000 0x4000000>;\n" "+\t\tbank-width = <4>;\n" "+\t};\n" "+\n" - "+\tnet at 10010000 {\n" + "+\tnet@10010000 {\n" "+\t\tcompatible = \"smsc,smc91c111\";\n" "+\t\treg = <0x10010000 0x10000>;\n" "+\t\tinterrupts = <25>;\n" "+\t};\n" "+\n" - "+\ti2c at 10002000 {\n" + "+\ti2c@10002000 {\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\t\tcompatible = \"arm,versatile-i2c\";\n" "+\t\treg = <0x10002000 0x1000>;\n" "+\n" - "+\t\trtc at 68 {\n" + "+\t\trtc@68 {\n" "+\t\t\tcompatible = \"dallas,ds1338\";\n" "+\t\t\treg = <0x68>;\n" "+\t\t};\n" "+\t};\n" "+\n" - "+\tlcd at 10008000 {\n" + "+\tlcd@10008000 {\n" "+\t\tcompatible = \"arm,versatile-lcd\";\n" "+\t\treg = <0x10008000 0x1000>;\n" "+\t};\n" @@ -229,7 +234,7 @@ "+/*\n" "+ * linux/arch/arm/mach-versatile/versatile_dt.c\n" "+ *\n" - "+ * Copyright (C) 2009 Jeremy Kerr <jeremy.kerr@canonical.com>\n" + "+ * Copyright (C) 2009 Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>\n" "+ * Copyright (C) 2004 ARM Limited\n" "+ * Copyright (C) 2000 Deep Blue Solutions Ltd\n" "+ *\n" @@ -379,4 +384,4 @@ " }\n" - -8dec40a5bba063ede1add95af1c2f99b6d99302f2faa2a6b21219f71784df7b5 +5a69cdad93a6b4e8b8489c6a54a03a1349d16e6e254ebcf0bd237264fb7dccf8
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.