diff for duplicates of <20131010222055.9063.29343.stgit@localhost> diff --git a/a/1.txt b/N1/1.txt index 8d43e51..3b35bb7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -47,7 +47,7 @@ index 0000000..b0ee342 + * they probably share the same GPIO IRQ + * REVISIT: Add timing support from slls644g.pdf + */ -+ 8250@3,0 { ++ 8250 at 3,0 { + compatible = "ns16550a"; + reg = <3 0 0x100>; + bank-width = <2>; @@ -59,7 +59,7 @@ index 0000000..b0ee342 + current-speed = <115200>; + }; + -+ ethernet@gpmc { ++ ethernet at gpmc { + reg = <7 0 0xff>; + interrupt-parent = <&gpio5>; + interrupts = <30 IRQ_TYPE_LEVEL_LOW>; /* gpio158 */ @@ -88,7 +88,7 @@ index 0000000..15eb9fe + compatible = "ti,omap3-zoom3", "ti,omap36xx", "ti,omap3"; + + cpus { -+ cpu@0 { ++ cpu at 0 { + cpu0-supply = <&vcc>; + }; + }; @@ -209,7 +209,7 @@ index 0000000..15eb9fe +&i2c1 { + clock-frequency = <2600000>; + -+ twl: twl@48 { ++ twl: twl at 48 { + reg = <0x48>; + interrupts = <7>; /* SYS_NIRQ cascaded to intc */ + interrupt-parent = <&intc>; @@ -228,7 +228,7 @@ index 0000000..15eb9fe + /* + * 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 7aa8a57..f20c90b 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 6/8] ARM: dts: Add basic support for zoom3\0" "Date\0Thu, 10 Oct 2013 15:20:55 -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" "I've tested serial, MMC, smsc911x and wl12xx on zoom3. As my\n" @@ -56,7 +54,7 @@ "+\t * they probably share the same GPIO IRQ\n" "+\t * REVISIT: Add timing support from slls644g.pdf\n" "+\t */\n" - "+\t8250@3,0 {\n" + "+\t8250 at 3,0 {\n" "+\t\tcompatible = \"ns16550a\";\n" "+\t\treg = <3 0 0x100>;\n" "+\t\tbank-width = <2>;\n" @@ -68,7 +66,7 @@ "+\t\tcurrent-speed = <115200>;\n" "+\t};\n" "+\n" - "+\tethernet@gpmc {\n" + "+\tethernet at gpmc {\n" "+\t\treg = <7 0 0xff>;\n" "+\t\tinterrupt-parent = <&gpio5>;\n" "+\t\tinterrupts = <30 IRQ_TYPE_LEVEL_LOW>;\t/* gpio158 */\n" @@ -97,7 +95,7 @@ "+\tcompatible = \"ti,omap3-zoom3\", \"ti,omap36xx\", \"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" @@ -218,7 +216,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" @@ -237,7 +235,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" @@ -298,4 +296,4 @@ "+\tpower = <50>;\n" +}; -8f756fbfcb4235360e39264a87c18822c6fbb1fbe2ee6160296200ddd45f9e4d +2eaf8abc176ce41a6d750fb9c8cb51016195863b9e33fe8e35de738e642f7dd7
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.