diff for duplicates of <1326588449-1794-6-git-send-email-sjg@chromium.org>
diff --git a/a/1.txt b/N1/1.txt
index 6b6f66d..9a79bde 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,7 +3,7 @@ Add LCD definitions and also a proposed binding for LCD displays.
The PWFM is in progress on the device-tree-discuss list, so only a
very basic binding is offered here.
-Signed-off-by: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
+Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/arm/dts/tegra20.dtsi | 25 ++++++
doc/device-tree-bindings/video/nvidia-video.txt | 92 +++++++++++++++++++++++
@@ -19,27 +19,27 @@ index 3d435aa..85c8bf6 100644
reg = <0x7000e200 0x0078>;
};
+
-+ pwfm0: pwm@7000a000 {
++ pwfm0: pwm at 7000a000 {
+ compatible = "nvidia,tegra20-pwfm";
+ reg = <0x7000a000 0x4>;
+ };
+
-+ pwfm1: pwm@7000a010 {
++ pwfm1: pwm at 7000a010 {
+ compatible = "nvidia,tegra20-pwfm";
+ reg = <0x7000a010 0x4>;
+ };
+
-+ pwfm2: pwm@7000a020 {
++ pwfm2: pwm at 7000a020 {
+ compatible = "nvidia,tegra20-pwfm";
+ reg = <0x7000a020 0x4>;
+ };
+
-+ pwfm3: pwm@7000a030 {
++ pwfm3: pwm at 7000a030 {
+ compatible = "nvidia,tegra20-pwfm";
+ reg = <0x7000a030 0x4>;
+ };
+
-+ display1: display@0x54200000 {
++ display1: display at 0x54200000 {
+ compatible = "nvidia,tegra20-display";
+ reg = <0x54200000 0x40000>;
+ };
@@ -118,7 +118,7 @@ index 0000000..ede9260
+
+Example:
+
-+display@0x54200000 {
++display at 0x54200000 {
+ pwfm = <&pwfm2>;
+
+ /* frame-buffer location to share with Linux */
diff --git a/a/content_digest b/N1/content_digest
index ceed0c8..5988745 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,24 +2,16 @@
"ref\0001326588449-1794-1-git-send-email-sjg\@chromium.org\0"
]
[
- "ref\0001326588449-1794-1-git-send-email-sjg-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org\0"
+ "From\0Simon Glass <sjg\@chromium.org>\0"
]
[
- "From\0Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org>\0"
-]
-[
- "Subject\0[PATCH 05/17] tegra: fdt: Add LCD definitions for Tegra\0"
+ "Subject\0[U-Boot] [PATCH 05/17] tegra: fdt: Add LCD definitions for Tegra\0"
]
[
"Date\0Sat, 14 Jan 2012 16:47:17 -0800\0"
]
[
- "To\0U-Boot Mailing List <u-boot-0aAXYlwwYIKGBzrmiIFOJg\@public.gmane.org>\0"
-]
-[
- "Cc\0Devicetree Discuss <devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ\@public.gmane.org>",
- " Tom Warren <twarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>",
- " Jerry Van Baren <vanbaren-He//nVnquyzQT0dZR+AlfA\@public.gmane.org>\0"
+ "To\0u-boot\@lists.denx.de\0"
]
[
"\0000:1\0"
@@ -33,7 +25,7 @@
"The PWFM is in progress on the device-tree-discuss list, so only a\n",
"very basic binding is offered here.\n",
"\n",
- "Signed-off-by: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org>\n",
+ "Signed-off-by: Simon Glass <sjg\@chromium.org>\n",
"---\n",
" arch/arm/dts/tegra20.dtsi | 25 ++++++\n",
" doc/device-tree-bindings/video/nvidia-video.txt | 92 +++++++++++++++++++++++\n",
@@ -49,27 +41,27 @@
" \t\treg = <0x7000e200 0x0078>;\n",
" \t};\n",
"+\n",
- "+\tpwfm0: pwm\@7000a000 {\n",
+ "+\tpwfm0: pwm at 7000a000 {\n",
"+\t\tcompatible = \"nvidia,tegra20-pwfm\";\n",
"+\t\treg = <0x7000a000 0x4>;\n",
"+\t};\n",
"+\n",
- "+\tpwfm1: pwm\@7000a010 {\n",
+ "+\tpwfm1: pwm at 7000a010 {\n",
"+\t\tcompatible = \"nvidia,tegra20-pwfm\";\n",
"+\t\treg = <0x7000a010 0x4>;\n",
"+\t};\n",
"+\n",
- "+\tpwfm2: pwm\@7000a020 {\n",
+ "+\tpwfm2: pwm at 7000a020 {\n",
"+\t\tcompatible = \"nvidia,tegra20-pwfm\";\n",
"+\t\treg = <0x7000a020 0x4>;\n",
"+\t};\n",
"+\n",
- "+\tpwfm3: pwm\@7000a030 {\n",
+ "+\tpwfm3: pwm at 7000a030 {\n",
"+\t\tcompatible = \"nvidia,tegra20-pwfm\";\n",
"+\t\treg = <0x7000a030 0x4>;\n",
"+\t};\n",
"+\n",
- "+\tdisplay1: display\@0x54200000 {\n",
+ "+\tdisplay1: display at 0x54200000 {\n",
"+\t\tcompatible = \"nvidia,tegra20-display\";\n",
"+\t\treg = <0x54200000 0x40000>;\n",
"+\t};\n",
@@ -148,7 +140,7 @@
"+\n",
"+Example:\n",
"+\n",
- "+display\@0x54200000 {\n",
+ "+display at 0x54200000 {\n",
"+\tpwfm = <&pwfm2>;\n",
"+\n",
"+\t/* frame-buffer location to share with Linux */\n",
@@ -176,4 +168,4 @@
"1.7.7.3"
]
-a6e74326dfa90fea57e7da3fd704bb8efe95c1c558e8e3615c644755c1903079
+5bde5c58326958eb8b776b7f00dc2febef0a9b73f11b379a7b112a964c47ed46
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.