diff for duplicates of <6232228.VG64Q2hTMz@flatron> diff --git a/a/1.txt b/N1/1.txt index 98700f1..5baba0e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -61,7 +61,7 @@ index 0000000..9fec67e +}; + +&soc { -+ clocks: clock-controller@7e00f000 { ++ clocks: clock-controller at 7e00f000 { + compatible = "samsung,s3c6400-clock"; + reg = <0x7e00f000 0x1000>; + #clock-cells = <1>; @@ -112,13 +112,13 @@ index 0000000..94276bd +}; + +&soc { -+ clocks: clock-controller@7e00f000 { ++ clocks: clock-controller at 7e00f000 { + compatible = "samsung,s3c6410-clock"; + reg = <0x7e00f000 0x1000>; + #clock-cells = <1>; + }; + -+ i2c1: i2c@7f00f000 { ++ i2c1: i2c at 7f00f000 { + compatible = "samsung,s3c2440-i2c"; + reg = <0x7f00f000 0x1000>; + interrupt-parent = <&vic0>; @@ -860,7 +860,7 @@ index 0000000..4e3be4d + #address-cells = <1>; + #size-cells = <0>; + -+ cpu@0 { ++ cpu at 0 { + device_type = "cpu"; + compatible = "arm,arm1176jzf-s", "arm,arm1176"; + reg = <0x0>; @@ -873,21 +873,21 @@ index 0000000..4e3be4d + #size-cells = <1>; + ranges; + -+ vic0: interrupt-controller@71200000 { ++ vic0: interrupt-controller at 71200000 { + compatible = "arm,pl192-vic"; + interrupt-controller; + reg = <0x71200000 0x1000>; + #interrupt-cells = <1>; + }; + -+ vic1: interrupt-controller@71300000 { ++ vic1: interrupt-controller at 71300000 { + compatible = "arm,pl192-vic"; + interrupt-controller; + reg = <0x71300000 0x1000>; + #interrupt-cells = <1>; + }; + -+ sdhci0: sdhci@7c200000 { ++ sdhci0: sdhci at 7c200000 { + compatible = "samsung,s3c6410-sdhci"; + reg = <0x7c200000 0x100>; + interrupt-parent = <&vic1>; @@ -898,7 +898,7 @@ index 0000000..4e3be4d + status = "disabled"; + }; + -+ sdhci1: sdhci@7c300000 { ++ sdhci1: sdhci at 7c300000 { + compatible = "samsung,s3c6410-sdhci"; + reg = <0x7c300000 0x100>; + interrupt-parent = <&vic1>; @@ -909,7 +909,7 @@ index 0000000..4e3be4d + status = "disabled"; + }; + -+ sdhci2: sdhci@7c400000 { ++ sdhci2: sdhci at 7c400000 { + compatible = "samsung,s3c6410-sdhci"; + reg = <0x7c400000 0x100>; + interrupt-parent = <&vic1>; @@ -920,7 +920,7 @@ index 0000000..4e3be4d + status = "disabled"; + }; + -+ watchdog: watchdog@7e004000 { ++ watchdog: watchdog at 7e004000 { + compatible = "samsung,s3c2410-wdt"; + reg = <0x7e004000 0x1000>; + interrupt-parent = <&vic0>; @@ -930,7 +930,7 @@ index 0000000..4e3be4d + status = "disabled"; + }; + -+ i2c0: i2c@7f004000 { ++ i2c0: i2c at 7f004000 { + compatible = "samsung,s3c2440-i2c"; + reg = <0x7f004000 0x1000>; + interrupt-parent = <&vic1>; @@ -942,7 +942,7 @@ index 0000000..4e3be4d + #size-cells = <0>; + }; + -+ uart0: serial@7f005000 { ++ uart0: serial at 7f005000 { + compatible = "samsung,s3c6400-uart"; + reg = <0x7f005000 0x100>; + interrupt-parent = <&vic1>; @@ -954,7 +954,7 @@ index 0000000..4e3be4d + status = "disabled"; + }; + -+ uart1: serial@7f005400 { ++ uart1: serial at 7f005400 { + compatible = "samsung,s3c6400-uart"; + reg = <0x7f005400 0x100>; + interrupt-parent = <&vic1>; @@ -966,7 +966,7 @@ index 0000000..4e3be4d + status = "disabled"; + }; + -+ uart2: serial@7f005800 { ++ uart2: serial at 7f005800 { + compatible = "samsung,s3c6400-uart"; + reg = <0x7f005800 0x100>; + interrupt-parent = <&vic1>; @@ -978,7 +978,7 @@ index 0000000..4e3be4d + status = "disabled"; + }; + -+ uart3: serial@7f005c00 { ++ uart3: serial at 7f005c00 { + compatible = "samsung,s3c6400-uart"; + reg = <0x7f005c00 0x100>; + interrupt-parent = <&vic1>; @@ -990,7 +990,7 @@ index 0000000..4e3be4d + status = "disabled"; + }; + -+ pwm: pwm@7f006000 { ++ pwm: pwm at 7f006000 { + compatible = "samsung,s3c6400-pwm"; + reg = <0x7f006000 0x1000>; + interrupt-parent = <&vic0>; @@ -1002,7 +1002,7 @@ index 0000000..4e3be4d + status = "disabled"; + }; + -+ pinctrl0: pinctrl@7f008000 { ++ pinctrl0: pinctrl at 7f008000 { + compatible = "samsung,s3c64xx-pinctrl"; + reg = <0x7f008000 0x1000>; + interrupt-parent = <&vic1>; diff --git a/a/content_digest b/N1/content_digest index f640e2a..4ae6714 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,25 +1,9 @@ "ref\01377120111-25601-1-git-send-email-tomasz.figa@gmail.com\0" "ref\01377120111-25601-6-git-send-email-tomasz.figa@gmail.com\0" - "From\0Tomasz Figa <tomasz.figa@gmail.com>\0" + "From\0tomasz.figa@gmail.com (Tomasz Figa)\0" "Subject\0[PATCH v8 5/7] ARM: dts: Add basic dts include files for Samsung S3C64xx SoCs\0" "Date\0Fri, 23 Aug 2013 01:24:22 +0200\0" - "To\0linux-samsung-soc@vger.kernel.org\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - devicetree@vger.kernel.org - Kukjin Kim <kgene.kim@samsung.com> - linux-gpio@vger.kernel.org - Ian Campbell <ian.campbell@citrix.com> - Linus Walleij <linus.walleij@linaro.org> - Mark Rutland <mark.rutland@arm.com> - Pawel Moll <pawel.moll@arm.com> - Rob Herring <rob.herring@calxeda.com> - Russell King <linux@arm.linux.org.uk> - Stephen Warren <swarren@wwwdotorg.org> - Thomas Gleixner <tglx@linutronix.de> - Olof Johansson <olof@lixom.net> - Arnd Bergmann <arnd@arndb.de> - Marc Zyngier <marc.zyngier@arm.com> - " Mark Brown <broonie@kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This patch adds basic device tree definitions for Samsung S3C64xx SoCs.\n" @@ -85,7 +69,7 @@ "+};\n" "+\n" "+&soc {\n" - "+\tclocks: clock-controller@7e00f000 {\n" + "+\tclocks: clock-controller at 7e00f000 {\n" "+\t\tcompatible = \"samsung,s3c6400-clock\";\n" "+\t\treg = <0x7e00f000 0x1000>;\n" "+\t\t#clock-cells = <1>;\n" @@ -136,13 +120,13 @@ "+};\n" "+\n" "+&soc {\n" - "+\tclocks: clock-controller@7e00f000 {\n" + "+\tclocks: clock-controller at 7e00f000 {\n" "+\t\tcompatible = \"samsung,s3c6410-clock\";\n" "+\t\treg = <0x7e00f000 0x1000>;\n" "+\t\t#clock-cells = <1>;\n" "+\t};\n" "+\n" - "+\ti2c1: i2c@7f00f000 {\n" + "+\ti2c1: i2c at 7f00f000 {\n" "+\t\tcompatible = \"samsung,s3c2440-i2c\";\n" "+\t\treg = <0x7f00f000 0x1000>;\n" "+\t\tinterrupt-parent = <&vic0>;\n" @@ -884,7 +868,7 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\tcpu@0 {\n" + "+\t\tcpu at 0 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,arm1176jzf-s\", \"arm,arm1176\";\n" "+\t\t\treg = <0x0>;\n" @@ -897,21 +881,21 @@ "+\t\t#size-cells = <1>;\n" "+\t\tranges;\n" "+\n" - "+\t\tvic0: interrupt-controller@71200000 {\n" + "+\t\tvic0: interrupt-controller at 71200000 {\n" "+\t\t\tcompatible = \"arm,pl192-vic\";\n" "+\t\t\tinterrupt-controller;\n" "+\t\t\treg = <0x71200000 0x1000>;\n" "+\t\t\t#interrupt-cells = <1>;\n" "+\t\t};\n" "+\n" - "+\t\tvic1: interrupt-controller@71300000 {\n" + "+\t\tvic1: interrupt-controller at 71300000 {\n" "+\t\t\tcompatible = \"arm,pl192-vic\";\n" "+\t\t\tinterrupt-controller;\n" "+\t\t\treg = <0x71300000 0x1000>;\n" "+\t\t\t#interrupt-cells = <1>;\n" "+\t\t};\n" "+\n" - "+\t\tsdhci0: sdhci@7c200000 {\n" + "+\t\tsdhci0: sdhci at 7c200000 {\n" "+\t\t\tcompatible = \"samsung,s3c6410-sdhci\";\n" "+\t\t\treg = <0x7c200000 0x100>;\n" "+\t\t\tinterrupt-parent = <&vic1>;\n" @@ -922,7 +906,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tsdhci1: sdhci@7c300000 {\n" + "+\t\tsdhci1: sdhci at 7c300000 {\n" "+\t\t\tcompatible = \"samsung,s3c6410-sdhci\";\n" "+\t\t\treg = <0x7c300000 0x100>;\n" "+\t\t\tinterrupt-parent = <&vic1>;\n" @@ -933,7 +917,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tsdhci2: sdhci@7c400000 {\n" + "+\t\tsdhci2: sdhci at 7c400000 {\n" "+\t\t\tcompatible = \"samsung,s3c6410-sdhci\";\n" "+\t\t\treg = <0x7c400000 0x100>;\n" "+\t\t\tinterrupt-parent = <&vic1>;\n" @@ -944,7 +928,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\twatchdog: watchdog@7e004000 {\n" + "+\t\twatchdog: watchdog at 7e004000 {\n" "+\t\t\tcompatible = \"samsung,s3c2410-wdt\";\n" "+\t\t\treg = <0x7e004000 0x1000>;\n" "+\t\t\tinterrupt-parent = <&vic0>;\n" @@ -954,7 +938,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\ti2c0: i2c@7f004000 {\n" + "+\t\ti2c0: i2c at 7f004000 {\n" "+\t\t\tcompatible = \"samsung,s3c2440-i2c\";\n" "+\t\t\treg = <0x7f004000 0x1000>;\n" "+\t\t\tinterrupt-parent = <&vic1>;\n" @@ -966,7 +950,7 @@ "+\t\t\t#size-cells = <0>;\n" "+\t\t};\n" "+\n" - "+\t\tuart0: serial@7f005000 {\n" + "+\t\tuart0: serial at 7f005000 {\n" "+\t\t\tcompatible = \"samsung,s3c6400-uart\";\n" "+\t\t\treg = <0x7f005000 0x100>;\n" "+\t\t\tinterrupt-parent = <&vic1>;\n" @@ -978,7 +962,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tuart1: serial@7f005400 {\n" + "+\t\tuart1: serial at 7f005400 {\n" "+\t\t\tcompatible = \"samsung,s3c6400-uart\";\n" "+\t\t\treg = <0x7f005400 0x100>;\n" "+\t\t\tinterrupt-parent = <&vic1>;\n" @@ -990,7 +974,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tuart2: serial@7f005800 {\n" + "+\t\tuart2: serial at 7f005800 {\n" "+\t\t\tcompatible = \"samsung,s3c6400-uart\";\n" "+\t\t\treg = <0x7f005800 0x100>;\n" "+\t\t\tinterrupt-parent = <&vic1>;\n" @@ -1002,7 +986,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tuart3: serial@7f005c00 {\n" + "+\t\tuart3: serial at 7f005c00 {\n" "+\t\t\tcompatible = \"samsung,s3c6400-uart\";\n" "+\t\t\treg = <0x7f005c00 0x100>;\n" "+\t\t\tinterrupt-parent = <&vic1>;\n" @@ -1014,7 +998,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tpwm: pwm@7f006000 {\n" + "+\t\tpwm: pwm at 7f006000 {\n" "+\t\t\tcompatible = \"samsung,s3c6400-pwm\";\n" "+\t\t\treg = <0x7f006000 0x1000>;\n" "+\t\t\tinterrupt-parent = <&vic0>;\n" @@ -1026,7 +1010,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tpinctrl0: pinctrl@7f008000 {\n" + "+\t\tpinctrl0: pinctrl at 7f008000 {\n" "+\t\t\tcompatible = \"samsung,s3c64xx-pinctrl\";\n" "+\t\t\treg = <0x7f008000 0x1000>;\n" "+\t\t\tinterrupt-parent = <&vic1>;\n" @@ -1055,4 +1039,4 @@ "-- \n" 1.8.3.2 -ce799c59f5f79094fa2f85a034d3e9d16ac7bd09315333bdc7427ed2f105e804 +1b54f21128a949d98c88cee06372b4c9be977eef8b84941787f2200f10d5e0ff
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.