diff for duplicates of <573F00CD.8070504@baylibre.com> diff --git a/a/content_digest b/N1/content_digest index 381b70b..ecf44eb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,7 +6,7 @@ "From\0narmstrong@baylibre.com (Neil Armstrong)\0" "Subject\0[PATCH 3/3] ARM64: dts: amlogic: Enable Reset Controller on GXBB-based platforms\0" "Date\0Fri, 20 May 2016 14:19:25 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 05/20/2016 11:10 AM, Carlo Caione wrote:\n" @@ -56,4 +56,4 @@ "\n" Neil -72ed600d96d2ee1ab1a756cbcc353cd8179afbf6ed1aaf5b91c025b347c8d355 +d290e21e12c4daa06687828abe18a1d3162328107c194828394e1258eddfd98d
diff --git a/a/1.txt b/N2/1.txt index 8663527..59ffdf0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,13 +17,13 @@ On 05/20/2016 11:10 AM, Carlo Caione wrote: >>>> #size-cells = <2>; >>>> ranges = <0x0 0x0 0x0 0xc1100000 0x0 0x100000>; >>>> ->>>> + reset: reset-controller at 4404 { +>>>> + reset: reset-controller@4404 { >>>> + compatible = "amlogic,meson-gxbb-reset"; >>>> + reg = <0x0 0x04404 0x0 0x20>; >>>> + #reset-cells = <1>; >>>> + }; >>>> + ->>>> uart_A: serial at 84c0 { +>>>> uart_A: serial@84c0 { >>>> compatible = "amlogic,meson-uart"; >>>> reg = <0x0 0x084c0 0x0 0x14>; >>> diff --git a/a/content_digest b/N2/content_digest index 381b70b..aaa1ca4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,10 +3,18 @@ "ref\020160520084748.GC16732@mephisto\0" "ref\0573ED06F.9070909@baylibre.com\0" "ref\020160520091050.GC19888@mephisto\0" - "From\0narmstrong@baylibre.com (Neil Armstrong)\0" - "Subject\0[PATCH 3/3] ARM64: dts: amlogic: Enable Reset Controller on GXBB-based platforms\0" + "From\0Neil Armstrong <narmstrong@baylibre.com>\0" + "Subject\0Re: [PATCH 3/3] ARM64: dts: amlogic: Enable Reset Controller on GXBB-based platforms\0" "Date\0Fri, 20 May 2016 14:19:25 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Carlo Caione <carlo@caione.org>\0" + "Cc\0devicetree@vger.kernel.org" + xing.xu@amlogic.com + victor.wan@amlogic.com + linux-kernel@vger.kernel.org + p.zabel@pengutronix.de + jerry.cao@amlogic.com + linux-amlogic@lists.infradead.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 05/20/2016 11:10 AM, Carlo Caione wrote:\n" @@ -28,13 +36,13 @@ ">>>> \t\t\t#size-cells = <2>;\n" ">>>> \t\t\tranges = <0x0 0x0 0x0 0xc1100000 0x0 0x100000>;\n" ">>>> \n" - ">>>> +\t\t\treset: reset-controller at 4404 {\n" + ">>>> +\t\t\treset: reset-controller@4404 {\n" ">>>> +\t\t\t\tcompatible = \"amlogic,meson-gxbb-reset\";\n" ">>>> +\t\t\t\treg = <0x0 0x04404 0x0 0x20>;\n" ">>>> +\t\t\t\t#reset-cells = <1>;\n" ">>>> +\t\t\t};\n" ">>>> +\n" - ">>>> \t\t\tuart_A: serial at 84c0 {\n" + ">>>> \t\t\tuart_A: serial@84c0 {\n" ">>>> \t\t\t\tcompatible = \"amlogic,meson-uart\";\n" ">>>> \t\t\t\treg = <0x0 0x084c0 0x0 0x14>;\n" ">>>\n" @@ -56,4 +64,4 @@ "\n" Neil -72ed600d96d2ee1ab1a756cbcc353cd8179afbf6ed1aaf5b91c025b347c8d355 +9a3134035d731753cf0187efbcabccfc7447ac6ef6eb627d947881b1b434985c
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.