diff for duplicates of <1421284089-421-1-git-send-email-khilman@kernel.org> diff --git a/a/1.txt b/N1/1.txt index dac6f73..61ad86d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,39 +46,39 @@ index c29123c0734d..50353d023225 100644 }; }; -+ i2c_0: i2c@12C60000 { ++ i2c_0: i2c at 12C60000 { + status = "okay"; + + /* A15 cluster: VDD_ARM */ -+ ina231@40 { ++ ina231 at 40 { + compatible = "ti,ina231"; + reg = <0x40>; + shunt-resistor = <10000>; + }; + + /* memory: VDD_MEM */ -+ ina231@41 { ++ ina231 at 41 { + compatible = "ti,ina231"; + reg = <0x41>; + shunt-resistor = <10000>; + }; + + /* GPU: VDD_G3D */ -+ ina231@44 { ++ ina231 at 44 { + compatible = "ti,ina231"; + reg = <0x44>; + shunt-resistor = <10000>; + }; + + /* A7 cluster: VDD_KFC */ -+ ina231@45 { ++ ina231 at 45 { + compatible = "ti,ina231"; + reg = <0x45>; + shunt-resistor = <10000>; + }; + }; + - i2c_2: i2c@12C80000 { + i2c_2: i2c at 12C80000 { samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; -- diff --git a/a/content_digest b/N1/content_digest index 313ce92..57a3b0f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,7 @@ - "From\0Kevin Hilman <khilman@kernel.org>\0" + "From\0khilman@kernel.org (Kevin Hilman)\0" "Subject\0[PATCH v2] ARM: dts: exynos5422-odroidxu3: add on-board INA231 sensors\0" "Date\0Wed, 14 Jan 2015 17:08:09 -0800\0" - "To\0Kukjin Kim <kgene.kim@samsung.com>" - " linux-samsung-soc@vger.kernel.org\0" - "Cc\0linaro-kernel@lists.linaro.org" - Javier Martinez Canillas <javier.martinez@collabora.co.uk> - Sjoerd Simons <sjoerd.simons@collabora.co.uk> - Rob Herring <robh+dt@kernel.org> - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Kumar Gala <galak@codeaurora.org> - Russell King <linux@arm.linux.org.uk> - Kukjin Kim <kgene@kernel.org> - open list:OPEN FIRMWARE AND... <devicetree@vger.kernel.org> - moderated list:ARM PORT <linux-arm-kernel@lists.infradead.org> - " open list <linux-kernel@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Kevin Hilman <khilman@linaro.org>\n" @@ -66,42 +52,42 @@ " \t\t};\n" " \t};\n" " \n" - "+\ti2c_0: i2c@12C60000 {\n" + "+\ti2c_0: i2c at 12C60000 {\n" "+\t\tstatus = \"okay\";\n" "+\n" "+\t\t/* A15 cluster: VDD_ARM */\n" - "+\t\tina231@40 {\n" + "+\t\tina231 at 40 {\n" "+\t\t\tcompatible = \"ti,ina231\";\n" "+\t\t\treg = <0x40>;\n" "+\t\t\tshunt-resistor = <10000>;\n" "+\t\t};\n" "+\n" "+\t\t/* memory: VDD_MEM */\n" - "+\t\tina231@41 {\n" + "+\t\tina231 at 41 {\n" "+\t\t\tcompatible = \"ti,ina231\";\n" "+\t\t\treg = <0x41>;\n" "+\t\t\tshunt-resistor = <10000>;\n" "+\t\t};\n" "+\n" "+\t\t/* GPU: VDD_G3D */\n" - "+\t\tina231@44 {\n" + "+\t\tina231 at 44 {\n" "+\t\t\tcompatible = \"ti,ina231\";\n" "+\t\t\treg = <0x44>;\n" "+\t\t\tshunt-resistor = <10000>;\n" "+\t\t};\n" "+\n" "+\t\t/* A7 cluster: VDD_KFC */\n" - "+\t\tina231@45 {\n" + "+\t\tina231 at 45 {\n" "+\t\t\tcompatible = \"ti,ina231\";\n" "+\t\t\treg = <0x45>;\n" "+\t\t\tshunt-resistor = <10000>;\n" "+\t\t};\n" "+\t};\n" "+\n" - " \ti2c_2: i2c@12C80000 {\n" + " \ti2c_2: i2c at 12C80000 {\n" " \t\tsamsung,i2c-sda-delay = <100>;\n" " \t\tsamsung,i2c-max-bus-freq = <66000>;\n" "-- \n" 2.1.3 -76c7c9c55d72508b064bf52f0e8206452296f95b0735da234361ce84aa90e43c +3459acf6b9cc5a60ba774015c3a84874a63eb8b9500c42c70b51521a034f8d3a
diff --git a/a/content_digest b/N2/content_digest index 313ce92..a3ebb17 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -13,9 +13,9 @@ Kumar Gala <galak@codeaurora.org> Russell King <linux@arm.linux.org.uk> Kukjin Kim <kgene@kernel.org> - open list:OPEN FIRMWARE AND... <devicetree@vger.kernel.org> - moderated list:ARM PORT <linux-arm-kernel@lists.infradead.org> - " open list <linux-kernel@vger.kernel.org>\0" + devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND...) + linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT) + " linux-kernel@vger.kernel.org (open list)\0" "\00:1\0" "b\0" "From: Kevin Hilman <khilman@linaro.org>\n" @@ -104,4 +104,4 @@ "-- \n" 2.1.3 -76c7c9c55d72508b064bf52f0e8206452296f95b0735da234361ce84aa90e43c +e7ee29f55ea0a454505f3538268198d99dce3592e6b82a27d8ed4cc808811c38
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.