diff for duplicates of <56449D35.1040104@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 0ef788e..4405283 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,14 +14,14 @@ index b9feeea..eb9bea1 100644 }; }; -+ spinbox: spinbox@480ca000 { ++ spinbox: spinbox at 480ca000 { + compatible = "ti,omap4-hwspinlock"; + reg = <0x480ca000 0x2000>; + ti,hwmods = "spinbox"; + #hwlock-cells = <1>; + }; + - mdio: mdio@4a100800 { + mdio: mdio at 4a100800 { compatible = "ti,davinci_mdio"; #address-cells = <1>; -- diff --git a/a/content_digest b/N1/content_digest index 78cfd12..6718b02 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,7 @@ - "From\0Neil Armstrong <narmstrong@baylibre.com>\0" + "From\0narmstrong@baylibre.com (Neil Armstrong)\0" "Subject\0[PATCH v2 5/5] arm: dts: Add omap4-hwspinlock support in dm816x\0" "Date\0Thu, 12 Nov 2015 15:07:49 +0100\0" - "To\0Tony Lindgren <tony@atomide.com>" - " Paul Walmsley <paul@pwsan.com>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - Brian Hutchinson <b.hutchman@gmail.com> - fisaksen@baylibre.com - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add dm816x DT entries for omap4-hwspinlock support as hwmod spinbox.\n" @@ -27,17 +20,17 @@ " \t\t\t};\n" " \t\t};\n" "\n" - "+\t\tspinbox: spinbox@480ca000 {\n" + "+\t\tspinbox: spinbox at 480ca000 {\n" "+\t\t\tcompatible = \"ti,omap4-hwspinlock\";\n" "+\t\t\treg = <0x480ca000 0x2000>;\n" "+\t\t\tti,hwmods = \"spinbox\";\n" "+\t\t\t#hwlock-cells = <1>;\n" "+\t\t};\n" "+\n" - " \t\tmdio: mdio@4a100800 {\n" + " \t\tmdio: mdio at 4a100800 {\n" " \t\t\tcompatible = \"ti,davinci_mdio\";\n" " \t\t\t#address-cells = <1>;\n" "-- \n" 1.9.1 -a6088950dd8af3a3830642eb445a7c258d1514cfbd1a27a77e6f853b07e2b706 +5b9d9315407702e37b29b7ee5bd1e5dcb0bb80f253019003195d7a3cb98490e0
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.