diff for duplicates of <20131010222051.9063.82848.stgit@localhost> diff --git a/a/1.txt b/N1/1.txt index 5f37784..6a0eed1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,7 +29,7 @@ index 0000000..75753bb + +/ { + cpus { -+ cpu@0 { ++ cpu at 0 { + cpu0-supply = <&vcc>; + }; + }; @@ -47,7 +47,7 @@ index 0000000..75753bb +&i2c1 { + clock-frequency = <2600000>; + -+ twl: twl@48 { ++ twl: twl at 48 { + reg = <0x48>; + interrupts = <7>; /* SYS_NIRQ cascaded to intc */ + interrupt-parent = <&intc>; @@ -67,7 +67,7 @@ index 0000000..75753bb + /* + * TVP5146 Video decoder-in for analog input support. + */ -+ tvp5146@5c { ++ tvp5146 at 5c { + compatible = "ti,tvp5146m2"; + reg = <0x5c>; + }; @@ -99,7 +99,7 @@ index 7d4329d..e10dcd0 100644 compatible = "ti,omap3-evm", "ti,omap3"; - cpus { -- cpu@0 { +- cpu at 0 { - cpu0-supply = <&vcc>; - }; - }; @@ -122,7 +122,7 @@ index 7d4329d..e10dcd0 100644 -&i2c1 { - clock-frequency = <2600000>; - -- twl: twl@48 { +- twl: twl at 48 { - reg = <0x48>; - interrupts = <7>; /* SYS_NIRQ cascaded to intc */ - interrupt-parent = <&intc>; @@ -142,7 +142,7 @@ index 7d4329d..e10dcd0 100644 - /* - * TVP5146 Video decoder-in for analog input support. - */ -- tvp5146@5c { +- tvp5146 at 5c { - compatible = "ti,tvp5146m2"; - reg = <0x5c>; - }; diff --git a/a/content_digest b/N1/content_digest index 1de2c0c..b045f96 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,8 @@ "ref\020131010221833.9063.49904.stgit@localhost\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 4/8] ARM: dts: Add common support for omap3-evm\0" "Date\0Thu, 10 Oct 2013 15:20:51 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0devicetree@vger.kernel.org" - " linux-omap@vger.kernel.org\0" "\00:1\0" "b\0" "Looks like the main difference between the TMDSEVM3530 and\n" @@ -38,7 +36,7 @@ "+\n" "+/ {\n" "+\tcpus {\n" - "+\t\tcpu@0 {\n" + "+\t\tcpu at 0 {\n" "+\t\t\tcpu0-supply = <&vcc>;\n" "+\t\t};\n" "+\t};\n" @@ -56,7 +54,7 @@ "+&i2c1 {\n" "+\tclock-frequency = <2600000>;\n" "+\n" - "+\ttwl: twl@48 {\n" + "+\ttwl: twl at 48 {\n" "+\t\treg = <0x48>;\n" "+\t\tinterrupts = <7>; /* SYS_NIRQ cascaded to intc */\n" "+\t\tinterrupt-parent = <&intc>;\n" @@ -76,7 +74,7 @@ "+\t/*\n" "+\t * TVP5146 Video decoder-in for analog input support.\n" "+\t */\n" - "+\ttvp5146@5c {\n" + "+\ttvp5146 at 5c {\n" "+\t\tcompatible = \"ti,tvp5146m2\";\n" "+\t\treg = <0x5c>;\n" "+\t};\n" @@ -108,7 +106,7 @@ " \tcompatible = \"ti,omap3-evm\", \"ti,omap3\";\n" " \n" "-\tcpus {\n" - "-\t\tcpu@0 {\n" + "-\t\tcpu at 0 {\n" "-\t\t\tcpu0-supply = <&vcc>;\n" "-\t\t};\n" "-\t};\n" @@ -131,7 +129,7 @@ "-&i2c1 {\n" "-\tclock-frequency = <2600000>;\n" "-\n" - "-\ttwl: twl@48 {\n" + "-\ttwl: twl at 48 {\n" "-\t\treg = <0x48>;\n" "-\t\tinterrupts = <7>; /* SYS_NIRQ cascaded to intc */\n" "-\t\tinterrupt-parent = <&intc>;\n" @@ -151,7 +149,7 @@ "-\t/*\n" "-\t * TVP5146 Video decoder-in for analog input support.\n" "-\t */\n" - "-\ttvp5146@5c {\n" + "-\ttvp5146 at 5c {\n" "-\t\tcompatible = \"ti,tvp5146m2\";\n" "-\t\treg = <0x5c>;\n" "-\t};\n" @@ -168,4 +166,4 @@ "-\tpower = <50>;\n" }; -b568b5f689a0ef6b29dc7aa9ac4e48f8925f9f7b5a5fc3b02246fdaddd987d31 +e614cb1a009c066c3767060073c712daa10074d051ffecea567774b7d379269f
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.