diff for duplicates of <20161018155835.qyoffwznacdac46y@rob-hp-laptop>
diff --git a/a/1.txt b/N1/1.txt
index a4db605..aef6e07 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -66,7 +66,7 @@ There is already a binding for this. Please merge them.
> +bit index in the register.
> +
> +Example: CRG nodes
-> +CRG: clock-reset-controller@12010000 {
+> +CRG: clock-reset-controller at 12010000 {
> + compatible = "hisilicon,hi3519-crg";
> + reg = <0x12010000 0x10000>;
> + #clock-cells = <1>;
@@ -74,7 +74,7 @@ There is already a binding for this. Please merge them.
> +};
> +
> +Example: consumer nodes
-> +i2c0: i2c@12110000 {
+> +i2c0: i2c at 12110000 {
> + compatible = "hisilicon,hi3519-i2c";
> + reg = <0x12110000 0x1000>;
> + clocks = <&CRG HI3519_I2C0_RST>;
diff --git a/a/content_digest b/N1/content_digest
index 2f27ec4..059aa6f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,34 +5,16 @@
"ref\00020161017120705.3726-3-wenpan\@hisilicon.com\0"
]
[
- "From\0Rob Herring <robh\@kernel.org>\0"
+ "From\0robh\@kernel.org (Rob Herring)\0"
]
[
- "Subject\0Re: [PATCH 2/3] clk: hisilicon: add CRG driver for Hi3516CV300 SoC\0"
+ "Subject\0[PATCH 2/3] clk: hisilicon: add CRG driver for Hi3516CV300 SoC\0"
]
[
"Date\0Tue, 18 Oct 2016 10:58:35 -0500\0"
]
[
- "To\0Pan Wen <wenpan\@hisilicon.com>\0"
-]
-[
- "Cc\0mturquette\@baylibre.com",
- " sboyd\@codeaurora.org",
- " mark.rutland\@arm.com",
- " linux\@armlinux.org.uk",
- " xuwei5\@hisilicon.com",
- " linux-clk\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " howell.yang\@hisilicon.com",
- " xuejiancheng\@hisilicon.com",
- " jalen.hsu\@hisilicon.com",
- " lvkuanliang\@hisilicon.com",
- " suwenping\@hisilicon.com",
- " raojun\@hisilicon.com",
- " kevin.lixu\@hisilicon.com\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -109,7 +91,7 @@
"> +bit index in the register.\n",
"> +\n",
"> +Example: CRG nodes\n",
- "> +CRG: clock-reset-controller\@12010000 {\n",
+ "> +CRG: clock-reset-controller at 12010000 {\n",
"> +\tcompatible = \"hisilicon,hi3519-crg\";\n",
"> +\treg = <0x12010000 0x10000>;\n",
"> +\t#clock-cells = <1>;\n",
@@ -117,7 +99,7 @@
"> +};\n",
"> +\n",
"> +Example: consumer nodes\n",
- "> +i2c0: i2c\@12110000 {\n",
+ "> +i2c0: i2c at 12110000 {\n",
"> +\tcompatible = \"hisilicon,hi3519-i2c\";\n",
"> +\treg = <0x12110000 0x1000>;\n",
"> +\tclocks = <&CRG HI3519_I2C0_RST>;\n",
@@ -125,4 +107,4 @@
"> +};"
]
-6caa0e88a96ecaa7fe7b4ae4f58d2703ad60173e3f44f1cc93b7f397ea445104
+1d9924e6e721442fd3278bbcb5f0c1b19f9d5752c0043349fffd24d96ac51ad5
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.