diff for duplicates of <1465729621-27378-1-git-send-email-hdegoede@redhat.com>
diff --git a/a/1.txt b/N1/1.txt
index 13e63f6..f7952c1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ Note both reg_usb1_vbus and reg_dldo4 need to be on for the hub attached
to usb1 to work, and we can list only one usb1_vbus-supply, so dldo4 is
marked as regulator-always-on.
-Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v2:
-Add a bit to the commit msg explaining why dldo4 is marked regulator-always-on
@@ -36,7 +36,7 @@ index e063dab..5faeae4 100644
+ phy-supply = <®_dldo1>;
status = "okay";
- phy1: ethernet-phy@1 {
+ phy1: ethernet-phy at 1 {
@@ -101,13 +106,26 @@
&mmc0 {
pinctrl-names = "default";
@@ -52,7 +52,7 @@ index e063dab..5faeae4 100644
+&p2wi {
+ status = "okay";
+
-+ axp22x: pmic@68 {
++ axp22x: pmic at 68 {
+ compatible = "x-powers,axp221";
+ reg = <0x68>;
+ interrupt-parent = <&nmi_intc>;
@@ -63,7 +63,7 @@ index e063dab..5faeae4 100644
+#include "axp22x.dtsi"
+
&pio {
- led_pins_m9: led_pins@0 {
+ led_pins_m9: led_pins at 0 {
allwinner,pins = "PH13";
@@ -131,6 +149,78 @@
};
@@ -152,9 +152,4 @@ index e063dab..5faeae4 100644
status = "okay";
};
--
-2.7.4
-
---
-To unsubscribe from this list: send the line "unsubscribe devicetree" in
-the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
+2.7.4
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index f008059..17da494 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,5 +1,5 @@
[
- "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>\0"
+ "From\0hdegoede\@redhat.com (Hans de Goede)\0"
]
[
"Subject\0[PATCH v3 1/2] ARM: dts: sun6i: Add pmic / regulator nodes to Mele A1000G quad dts\0"
@@ -8,13 +8,7 @@
"Date\0Sun, 12 Jun 2016 13:07:00 +0200\0"
]
[
- "To\0Chen-Yu Tsai <wens-jdAy2FN1RRM\@public.gmane.org>",
- " Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\0"
-]
-[
- "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
- " devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA\@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"
@@ -29,7 +23,7 @@
"to usb1 to work, and we can list only one usb1_vbus-supply, so dldo4 is\n",
"marked as regulator-always-on.\n",
"\n",
- "Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>\n",
+ "Signed-off-by: Hans de Goede <hdegoede\@redhat.com>\n",
"---\n",
"Changes in v2:\n",
"-Add a bit to the commit msg explaining why dldo4 is marked regulator-always-on\n",
@@ -61,7 +55,7 @@
"+\tphy-supply = <®_dldo1>;\n",
" \tstatus = \"okay\";\n",
" \n",
- " \tphy1: ethernet-phy\@1 {\n",
+ " \tphy1: ethernet-phy at 1 {\n",
"\@\@ -101,13 +106,26 \@\@\n",
" &mmc0 {\n",
" \tpinctrl-names = \"default\";\n",
@@ -77,7 +71,7 @@
"+&p2wi {\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\taxp22x: pmic\@68 {\n",
+ "+\taxp22x: pmic at 68 {\n",
"+\t\tcompatible = \"x-powers,axp221\";\n",
"+\t\treg = <0x68>;\n",
"+\t\tinterrupt-parent = <&nmi_intc>;\n",
@@ -88,7 +82,7 @@
"+#include \"axp22x.dtsi\"\n",
"+\n",
" &pio {\n",
- " \tled_pins_m9: led_pins\@0 {\n",
+ " \tled_pins_m9: led_pins at 0 {\n",
" \t\tallwinner,pins = \"PH13\";\n",
"\@\@ -131,6 +149,78 \@\@\n",
" \t};\n",
@@ -177,12 +171,7 @@
" \tstatus = \"okay\";\n",
" };\n",
"-- \n",
- "2.7.4\n",
- "\n",
- "--\n",
- "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n",
- "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\n",
- "More majordomo info at http://vger.kernel.org/majordomo-info.html"
+ "2.7.4"
]
-c5c2cc508eb05d1b3211e6056ce837c4e3d66fc3d21df2b88aca783fbf7bc21b
+d0d744ca834d60d15ecf6eb8ab9d46322a72ecb2e7540e94eed626b7aea8baf4
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.