diff for duplicates of <1360887677-20758-2-git-send-email-dianders@chromium.org>
diff --git a/a/1.txt b/N1/1.txt
index 858786a..ae56760 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -28,7 +28,7 @@ index 46c0980..f451375 100644
@@ -58,7 +58,10 @@
};
- i2c@12CA0000 {
+ i2c at 12CA0000 {
- status = "disabled";
+ samsung,i2c-sda-delay = <100>;
+ samsung,i2c-max-bus-freq = <66000>;
@@ -36,7 +36,7 @@ index 46c0980..f451375 100644
+ <&gpa2 1 3 3 0>;
};
- i2c@12CB0000 {
+ i2c at 12CB0000 {
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index 17dd951..d2d4b48 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
@@ -70,7 +70,7 @@ index 17dd951..d2d4b48 100644
+ wait-free-us = <50000>;
+
+ /* Use ID 104 as a hint that we're on physical bus 4 */
-+ i2c_104: i2c@0 {
++ i2c_104: i2c at 0 {
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
diff --git a/a/content_digest b/N1/content_digest
index 4c4db64..a17ab92 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001360887677-20758-1-git-send-email-dianders\@chromium.org\0"
]
[
- "From\0Doug Anderson <dianders\@chromium.org>\0"
+ "From\0dianders\@chromium.org (Doug Anderson)\0"
]
[
"Subject\0[PATCH v2 2/3] ARM: dts: Add i2c-arbitrator bus for exynos5250-snow\0"
@@ -11,32 +11,7 @@
"Date\0Thu, 14 Feb 2013 16:21:16 -0800\0"
]
[
- "To\0Wolfram Sang <wolfram\@the-dreams.de>\0"
-]
-[
- "Cc\0Guenter Roeck <linux\@roeck-us.net>",
- " Linus Walleij <linus.walleij\@linaro.org>",
- " Simon Glass <sjg\@chromium.org>",
- " Naveen Krishna Chatradhi <ch.naveen\@samsung.com>",
- " Grant Likely <grant.likely\@secretlab.ca>",
- " Yuvaraj Kumar <yuvaraj.cd\@gmail.com>",
- " Ben Dooks <ben.dooks\@codethink.co.uk>",
- " u.kleine-koenig\@pengutronix.de",
- " Mark Brown <broonie\@opensource.wolfsonmicro.com>",
- " Girish Shivananjappa <girish.shivananjappa\@linaro.org>",
- " bhushan.r\@samsung.com",
- " sreekumar.c\@samsung.com",
- " Prashanth G <prashanth.g\@samsung.com>",
- " Olof Johansson <olof\@lixom.net>",
- " Daniel Kurtz <djkurtz\@chromium.org>",
- " Grant Grundler <grundler\@chromium.org>",
- " Doug Anderson <dianders\@chromium.org>",
- " Russell King <linux\@arm.linux.org.uk>",
- " Kukjin Kim <kgene.kim\@samsung.com>",
- " Rahul Sharma <rahul.sharma\@samsung.com>",
- " Thomas Abraham <thomas.abraham\@linaro.org>",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -75,7 +50,7 @@
"\@\@ -58,7 +58,10 \@\@\n",
" \t};\n",
" \n",
- " \ti2c\@12CA0000 {\n",
+ " \ti2c at 12CA0000 {\n",
"-\t\tstatus = \"disabled\";\n",
"+\t\tsamsung,i2c-sda-delay = <100>;\n",
"+\t\tsamsung,i2c-max-bus-freq = <66000>;\n",
@@ -83,7 +58,7 @@
"+\t\t\t<&gpa2 1 3 3 0>;\n",
" \t};\n",
" \n",
- " \ti2c\@12CB0000 {\n",
+ " \ti2c at 12CB0000 {\n",
"diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts\n",
"index 17dd951..d2d4b48 100644\n",
"--- a/arch/arm/boot/dts/exynos5250-snow.dts\n",
@@ -117,7 +92,7 @@
"+\t\twait-free-us = <50000>;\n",
"+\n",
"+\t\t/* Use ID 104 as a hint that we're on physical bus 4 */\n",
- "+\t\ti2c_104: i2c\@0 {\n",
+ "+\t\ti2c_104: i2c at 0 {\n",
"+\t\t\treg = <0>;\n",
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <0>;\n",
@@ -131,4 +106,4 @@
"1.8.1"
]
-f5f40c697a1c2b763d53e9ae40e626bf4152bededc12a9f3f03fae8f57d1b0aa
+68e1cff7b37bbe22641c29fb1d1c76bf67e94b9ad38d63cead7cd9b06868e9c8
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.