diff for duplicates of <1390088935-7193-13-git-send-email-hdegoede@redhat.com>
diff --git a/a/1.txt b/N1/1.txt
index a1e7af5..03f11e5 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,11 +1,11 @@
-From: Oliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org>
+From: Oliver Schinagl <oliver@schinagl.nl>
This patch adds sunxi sata support to A10 boards that have such a connector.
Some boards also feature a regulator via a GPIO and support for this is also
added.
-Signed-off-by: Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org>
-Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +++++
@@ -22,12 +22,12 @@ index aef8207..fd6d512 100644
status = "okay";
};
-+ sata: ahci@01c18000 {
++ sata: ahci at 01c18000 {
+ status = "okay";
+ };
+
- pinctrl@01c20800 {
- mmc0_cd_pin_a1000: mmc0_cd_pin@0 {
+ pinctrl at 01c20800 {
+ mmc0_cd_pin_a1000: mmc0_cd_pin at 0 {
allwinner,pins = "PH1";
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index f50fb2b..d23aaa8 100644
@@ -45,13 +45,13 @@ index f50fb2b..d23aaa8 100644
status = "okay";
};
-+ sata: ahci@01c18000 {
++ sata: ahci at 01c18000 {
+ target-supply = <®_ahci_5v>;
+ status = "okay";
+ };
+
- pinctrl@01c20800 {
- mmc0_cd_pin_cubieboard: mmc0_cd_pin@0 {
+ pinctrl at 01c20800 {
+ mmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 {
allwinner,pins = "PH1";
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 4736dd2..09517c3 100644
@@ -61,7 +61,7 @@ index 4736dd2..09517c3 100644
status = "disabled";
};
-+ sata: ahci@01c18000 {
++ sata: ahci at 01c18000 {
+ compatible = "allwinner,sun4i-a10-ahci";
+ reg = <0x01c18000 0x1000>;
+ interrupts = <56>;
@@ -69,7 +69,7 @@ index 4736dd2..09517c3 100644
+ status = "disabled";
+ };
+
- intc: interrupt-controller@01c20400 {
+ intc: interrupt-controller at 01c20400 {
compatible = "allwinner,sun4i-ic";
reg = <0x01c20400 0x400>;
diff --git a/arch/arm/boot/dts/sunxi-ahci-reg.dtsi b/arch/arm/boot/dts/sunxi-ahci-reg.dtsi
@@ -81,7 +81,7 @@ index 0000000..955b197
+/*
+ * sunxi boards sata target power supply common code
+ *
-+ * Copyright 2014 - Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
++ * Copyright 2014 - Hans de Goede <hdegoede@redhat.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
@@ -92,8 +92,8 @@ index 0000000..955b197
+ */
+
+/ {
-+ soc@01c00000 {
-+ ahci_pwr_pin_a: ahci_pwr_pin@0 {
++ soc at 01c00000 {
++ ahci_pwr_pin_a: ahci_pwr_pin at 0 {
+ allwinner,pins = "PB8";
+ allwinner,function = "gpio_out";
+ allwinner,drive = <0>;
diff --git a/a/content_digest b/N1/content_digest
index f110fed..0b920a8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,10 +2,7 @@
"ref\0001390088935-7193-1-git-send-email-hdegoede\@redhat.com\0"
]
[
- "ref\0001390088935-7193-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org\0"
-]
-[
- "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>\0"
+ "From\0hdegoede\@redhat.com (Hans de Goede)\0"
]
[
"Subject\0[RFC v3 12/13] ARM: sun4i: dts: Add ahci / sata support\0"
@@ -14,17 +11,7 @@
"Date\0Sun, 19 Jan 2014 00:48:54 +0100\0"
]
[
- "To\0Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>\0"
-]
-[
- "Cc\0Oliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A\@public.gmane.org>",
- " Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>",
- " Richard Zhu <Hong-Xing.Zhu-KZfg59tc24xl57MIdRCFDg\@public.gmane.org>",
- " linux-ide-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
- " devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org>",
- " linux-sunxi-/JYPxA39Uh5TLH3MbocFFw\@public.gmane.org",
- " Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -33,14 +20,14 @@
"b\0"
]
[
- "From: Oliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A\@public.gmane.org>\n",
+ "From: Oliver Schinagl <oliver\@schinagl.nl>\n",
"\n",
"This patch adds sunxi sata support to A10 boards that have such a connector.\n",
"Some boards also feature a regulator via a GPIO and support for this is also\n",
"added.\n",
"\n",
- "Signed-off-by: Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A\@public.gmane.org>\n",
- "Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>\n",
+ "Signed-off-by: Olliver Schinagl <oliver\@schinagl.nl>\n",
+ "Signed-off-by: Hans de Goede <hdegoede\@redhat.com>\n",
"---\n",
" arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++\n",
" arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +++++\n",
@@ -57,12 +44,12 @@
" \t\t\tstatus = \"okay\";\n",
" \t\t};\n",
" \n",
- "+\t\tsata: ahci\@01c18000 {\n",
+ "+\t\tsata: ahci at 01c18000 {\n",
"+\t\t\tstatus = \"okay\";\n",
"+\t\t};\n",
"+\n",
- " \t\tpinctrl\@01c20800 {\n",
- " \t\t\tmmc0_cd_pin_a1000: mmc0_cd_pin\@0 {\n",
+ " \t\tpinctrl at 01c20800 {\n",
+ " \t\t\tmmc0_cd_pin_a1000: mmc0_cd_pin at 0 {\n",
" \t\t\t\tallwinner,pins = \"PH1\";\n",
"diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts\n",
"index f50fb2b..d23aaa8 100644\n",
@@ -80,13 +67,13 @@
" \t\t\tstatus = \"okay\";\n",
" \t\t};\n",
" \n",
- "+\t\tsata: ahci\@01c18000 {\n",
+ "+\t\tsata: ahci at 01c18000 {\n",
"+\t\t\ttarget-supply = <®_ahci_5v>;\n",
"+\t\t\tstatus = \"okay\";\n",
"+\t\t};\n",
"+\n",
- " \t\tpinctrl\@01c20800 {\n",
- " \t\t\tmmc0_cd_pin_cubieboard: mmc0_cd_pin\@0 {\n",
+ " \t\tpinctrl at 01c20800 {\n",
+ " \t\t\tmmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 {\n",
" \t\t\t\tallwinner,pins = \"PH1\";\n",
"diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi\n",
"index 4736dd2..09517c3 100644\n",
@@ -96,7 +83,7 @@
" \t\t\tstatus = \"disabled\";\n",
" \t\t};\n",
" \n",
- "+\t\tsata: ahci\@01c18000 {\n",
+ "+\t\tsata: ahci at 01c18000 {\n",
"+\t\t\tcompatible = \"allwinner,sun4i-a10-ahci\";\n",
"+\t\t\treg = <0x01c18000 0x1000>;\n",
"+\t\t\tinterrupts = <56>;\n",
@@ -104,7 +91,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- " \t\tintc: interrupt-controller\@01c20400 {\n",
+ " \t\tintc: interrupt-controller at 01c20400 {\n",
" \t\t\tcompatible = \"allwinner,sun4i-ic\";\n",
" \t\t\treg = <0x01c20400 0x400>;\n",
"diff --git a/arch/arm/boot/dts/sunxi-ahci-reg.dtsi b/arch/arm/boot/dts/sunxi-ahci-reg.dtsi\n",
@@ -116,7 +103,7 @@
"+/*\n",
"+ * sunxi boards sata target power supply common code\n",
"+ *\n",
- "+ * Copyright 2014 - Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>\n",
+ "+ * Copyright 2014 - Hans de Goede <hdegoede\@redhat.com>\n",
"+ *\n",
"+ * The code contained herein is licensed under the GNU General Public\n",
"+ * License. You may obtain a copy of the GNU General Public License\n",
@@ -127,8 +114,8 @@
"+ */\n",
"+\n",
"+/ {\n",
- "+\tsoc\@01c00000 {\n",
- "+\t\tahci_pwr_pin_a: ahci_pwr_pin\@0 {\n",
+ "+\tsoc at 01c00000 {\n",
+ "+\t\tahci_pwr_pin_a: ahci_pwr_pin at 0 {\n",
"+\t\t\tallwinner,pins = \"PB8\";\n",
"+\t\t\tallwinner,function = \"gpio_out\";\n",
"+\t\t\tallwinner,drive = <0>;\n",
@@ -155,4 +142,4 @@
"1.8.4.2"
]
-f545b6335e19e9cb0cdaf73fb2d7f1f5b6ba5fcaa6ddd3a3eb99cedbccbf6644
+3f1ee335145cbf12f7655486dc70799408ffa2fe62a77d6da7b5a03def5d9384
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.