diff for duplicates of <20160810043424.GH26240@tuxbot> diff --git a/a/1.txt b/N1/1.txt index 213d4b6..8d402a1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ On Mon 08 Aug 16:03 PDT 2016, John Stultz wrote: [..] > diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts [..] -> memory at 0 { +> memory@0 { > device_type = "memory"; > reg = <0x00000000 0x00000000 0x00000000 0x05e00000>, > - <0x00000000 0x05f00000 0x00000000 0x00eff000>, @@ -18,16 +18,16 @@ in the /memory node, but rather add these regions as no-map in a /reserved-memory node. But that's a unrelated matter. > -> + reboot-mode-syscon at 5f01000 { +> + reboot-mode-syscon@5f01000 { > + compatible = "syscon", "simple-mfd"; > + reg = <0x0 0x05f01000 0x0 0x00001000>; > + -> + reboot-mode at 0 { +> + reboot-mode@0 { Drop the @0 Other than that: -Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org> +Acked-by: Bjorn Andersson <bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > + compatible = "syscon-reboot-mode"; > + offset = <0x0>; @@ -39,8 +39,12 @@ Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org> > + }; > + > soc { -> spi0: spi at f7106000 { +> spi0: spi@f7106000 { > status = "ok"; Regards, Bjorn +-- +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 diff --git a/a/content_digest b/N1/content_digest index 7d99b7d..7c01ef9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,21 @@ "ref\01470697426-16426-1-git-send-email-john.stultz@linaro.org\0" "ref\01470697426-16426-3-git-send-email-john.stultz@linaro.org\0" - "From\0bjorn.andersson@linaro.org (Bjorn Andersson)\0" - "Subject\0[RFC][PATCH 3/4] arm64: dts: hikey: Add hikey support for syscon-reboot-mode\0" + "ref\01470697426-16426-3-git-send-email-john.stultz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" + "From\0Bjorn Andersson <bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Subject\0Re: [RFC][PATCH 3/4] arm64: dts: hikey: Add hikey support for syscon-reboot-mode\0" "Date\0Tue, 9 Aug 2016 21:34:24 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0John Stultz <john.stultz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Cc\0lkml <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>" + Andy Yan <andy.yan-TNX95d0MmH7DzftRWevZcw@public.gmane.org> + Haojian Zhuang <haojian.zhuang-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Guodong Xu <guodong.xu-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Wei Xu <xuwei5-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org> + Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On Mon 08 Aug 16:03 PDT 2016, John Stultz wrote:\n" @@ -11,7 +23,7 @@ "[..]\n" "> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts\n" "[..]\n" - "> \tmemory at 0 {\n" + "> \tmemory@0 {\n" "> \t\tdevice_type = \"memory\";\n" "> \t\treg = <0x00000000 0x00000000 0x00000000 0x05e00000>,\n" "> -\t\t <0x00000000 0x05f00000 0x00000000 0x00eff000>,\n" @@ -26,16 +38,16 @@ "/reserved-memory node. But that's a unrelated matter.\n" "\n" "> \n" - "> +\treboot-mode-syscon at 5f01000 {\n" + "> +\treboot-mode-syscon@5f01000 {\n" "> +\t\tcompatible = \"syscon\", \"simple-mfd\";\n" "> +\t\treg = <0x0 0x05f01000 0x0 0x00001000>;\n" "> +\n" - "> +\t\treboot-mode at 0 {\n" + "> +\t\treboot-mode@0 {\n" "\n" "Drop the @0\n" "\n" "Other than that:\n" - "Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>\n" + "Acked-by: Bjorn Andersson <bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" "\n" "> +\t\t\tcompatible = \"syscon-reboot-mode\";\n" "> +\t\t\toffset = <0x0>;\n" @@ -47,10 +59,14 @@ "> +\t};\n" "> +\n" "> \tsoc {\n" - "> \t\tspi0: spi at f7106000 {\n" + "> \t\tspi0: spi@f7106000 {\n" "> \t\t\tstatus = \"ok\";\n" "\n" "Regards,\n" - Bjorn + "Bjorn\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 -5d6ab74d880dfc843f8102d8bb9bf044a037eb3f26ae59d8dd1aad333c2f6b9a +8b0a3f8d338be4e375f61d0d444f909f235cc4cba4b3630d0f7f962bbaedccac
diff --git a/a/1.txt b/N2/1.txt index 213d4b6..09d9ca1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,7 +3,7 @@ On Mon 08 Aug 16:03 PDT 2016, John Stultz wrote: [..] > diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts [..] -> memory at 0 { +> memory@0 { > device_type = "memory"; > reg = <0x00000000 0x00000000 0x00000000 0x05e00000>, > - <0x00000000 0x05f00000 0x00000000 0x00eff000>, @@ -18,11 +18,11 @@ in the /memory node, but rather add these regions as no-map in a /reserved-memory node. But that's a unrelated matter. > -> + reboot-mode-syscon at 5f01000 { +> + reboot-mode-syscon@5f01000 { > + compatible = "syscon", "simple-mfd"; > + reg = <0x0 0x05f01000 0x0 0x00001000>; > + -> + reboot-mode at 0 { +> + reboot-mode@0 { Drop the @0 @@ -39,7 +39,7 @@ Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org> > + }; > + > soc { -> spi0: spi at f7106000 { +> spi0: spi@f7106000 { > status = "ok"; Regards, diff --git a/a/content_digest b/N2/content_digest index 7d99b7d..79636c2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,20 @@ "ref\01470697426-16426-1-git-send-email-john.stultz@linaro.org\0" "ref\01470697426-16426-3-git-send-email-john.stultz@linaro.org\0" - "From\0bjorn.andersson@linaro.org (Bjorn Andersson)\0" - "Subject\0[RFC][PATCH 3/4] arm64: dts: hikey: Add hikey support for syscon-reboot-mode\0" + "From\0Bjorn Andersson <bjorn.andersson@linaro.org>\0" + "Subject\0Re: [RFC][PATCH 3/4] arm64: dts: hikey: Add hikey support for syscon-reboot-mode\0" "Date\0Tue, 9 Aug 2016 21:34:24 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0John Stultz <john.stultz@linaro.org>\0" + "Cc\0lkml <linux-kernel@vger.kernel.org>" + Andy Yan <andy.yan@rock-chips.com> + Haojian Zhuang <haojian.zhuang@linaro.org> + Guodong Xu <guodong.xu@linaro.org> + Wei Xu <xuwei5@hisilicon.com> + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + Catalin Marinas <catalin.marinas@arm.com> + Will Deacon <will.deacon@arm.com> + linux-arm-kernel@lists.infradead.org + " devicetree@vger.kernel.org\0" "\00:1\0" "b\0" "On Mon 08 Aug 16:03 PDT 2016, John Stultz wrote:\n" @@ -11,7 +22,7 @@ "[..]\n" "> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts\n" "[..]\n" - "> \tmemory at 0 {\n" + "> \tmemory@0 {\n" "> \t\tdevice_type = \"memory\";\n" "> \t\treg = <0x00000000 0x00000000 0x00000000 0x05e00000>,\n" "> -\t\t <0x00000000 0x05f00000 0x00000000 0x00eff000>,\n" @@ -26,11 +37,11 @@ "/reserved-memory node. But that's a unrelated matter.\n" "\n" "> \n" - "> +\treboot-mode-syscon at 5f01000 {\n" + "> +\treboot-mode-syscon@5f01000 {\n" "> +\t\tcompatible = \"syscon\", \"simple-mfd\";\n" "> +\t\treg = <0x0 0x05f01000 0x0 0x00001000>;\n" "> +\n" - "> +\t\treboot-mode at 0 {\n" + "> +\t\treboot-mode@0 {\n" "\n" "Drop the @0\n" "\n" @@ -47,10 +58,10 @@ "> +\t};\n" "> +\n" "> \tsoc {\n" - "> \t\tspi0: spi at f7106000 {\n" + "> \t\tspi0: spi@f7106000 {\n" "> \t\t\tstatus = \"ok\";\n" "\n" "Regards,\n" Bjorn -5d6ab74d880dfc843f8102d8bb9bf044a037eb3f26ae59d8dd1aad333c2f6b9a +0555db191cb165b8c8e0b4d67c69e2f8f06fda4a13567399b4dc959c23407dca
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.