diff for duplicates of <1497260577.3086.11.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 30c2e89..074a0cf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,23 +2,23 @@ On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote: > Switch to the stable UART bindings by adding a XTAL node and using the > proper compatible strings. > -> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> +> Signed-off-by: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> Shouldn't this patch be squashed with patch 4 ? > --- -> ?arch/arm/boot/dts/meson6.dtsi | 28 ++++++++++++++++++++++++++++ -> ?1 file changed, 28 insertions(+) +> arch/arm/boot/dts/meson6.dtsi | 28 ++++++++++++++++++++++++++++ +> 1 file changed, 28 insertions(+) > > diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi > index b0fc91f..a334fbe 100644 > --- a/arch/arm/boot/dts/meson6.dtsi > +++ b/arch/arm/boot/dts/meson6.dtsi > @@ -70,9 +70,37 @@ -> ? }; -> ? }; -> ? +> }; +> }; +> > + xtal: xtal-clk { > + compatible = "fixed-clock"; > + clock-frequency = <24000000>; @@ -26,12 +26,12 @@ Shouldn't this patch be squashed with patch 4 ? > + #clock-cells = <0>; > + }; > + -> ? clk81: clk at 0 { -> ? #clock-cells = <0>; -> ? compatible = "fixed-clock"; -> ? clock-frequency = <200000000>; -> ? }; -> ?}; /* end of / */ +> clk81: clk@0 { +> #clock-cells = <0>; +> compatible = "fixed-clock"; +> clock-frequency = <200000000>; +> }; +> }; /* end of / */ > + > + > +&uart_AO { @@ -53,3 +53,8 @@ Shouldn't this patch be squashed with patch 4 ? > + clocks = <&xtal>, <&clk81>, <&clk81>; > + clock-names = "xtal", "pclk", "baud"; > +}; + +-- +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 10c9795..e572839 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,32 +1,41 @@ "ref\01497001756-942-1-git-send-email-narmstrong@baylibre.com\0" "ref\01497001756-942-6-git-send-email-narmstrong@baylibre.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v4 5/7] ARM: dts: meson6: switch to new bindings for UART nodes\0" + "ref\01497001756-942-6-git-send-email-narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org\0" + "From\0Jerome Brunet <jbrunet-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>\0" + "Subject\0Re: [PATCH v4 5/7] ARM: dts: meson6: switch to new bindings for UART nodes\0" "Date\0Mon, 12 Jun 2017 11:42:57 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>" + gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org + " khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org\0" + "Cc\0hgkr.klein-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" + linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote:\n" "> Switch to the stable UART bindings by adding a XTAL node and using the\n" "> proper compatible strings.\n" "> \n" - "> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>\n" + "> Signed-off-by: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>\n" "\n" "Shouldn't this patch be squashed with patch 4 ?\n" "\n" "\n" "> ---\n" - "> ?arch/arm/boot/dts/meson6.dtsi | 28 ++++++++++++++++++++++++++++\n" - "> ?1 file changed, 28 insertions(+)\n" + "> \302\240arch/arm/boot/dts/meson6.dtsi | 28 ++++++++++++++++++++++++++++\n" + "> \302\2401 file changed, 28 insertions(+)\n" "> \n" "> diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi\n" "> index b0fc91f..a334fbe 100644\n" "> --- a/arch/arm/boot/dts/meson6.dtsi\n" "> +++ b/arch/arm/boot/dts/meson6.dtsi\n" "> @@ -70,9 +70,37 @@\n" - "> ?\t\t};\n" - "> ?\t};\n" - "> ?\n" + "> \302\240\t\t};\n" + "> \302\240\t};\n" + "> \302\240\n" "> +\txtal: xtal-clk {\n" "> +\t\tcompatible = \"fixed-clock\";\n" "> +\t\tclock-frequency = <24000000>;\n" @@ -34,12 +43,12 @@ "> +\t\t#clock-cells = <0>;\n" "> +\t};\n" "> +\n" - "> ?\tclk81: clk at 0 {\n" - "> ?\t\t#clock-cells = <0>;\n" - "> ?\t\tcompatible = \"fixed-clock\";\n" - "> ?\t\tclock-frequency = <200000000>;\n" - "> ?\t};\n" - "> ?}; /* end of / */\n" + "> \302\240\tclk81: clk@0 {\n" + "> \302\240\t\t#clock-cells = <0>;\n" + "> \302\240\t\tcompatible = \"fixed-clock\";\n" + "> \302\240\t\tclock-frequency = <200000000>;\n" + "> \302\240\t};\n" + "> \302\240}; /* end of / */\n" "> +\n" "> +\n" "> +&uart_AO {\n" @@ -60,6 +69,11 @@ "> +&uart_C {\n" "> +\tclocks = <&xtal>, <&clk81>, <&clk81>;\n" "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" - > +}; + "> +};\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 -578ef7f46bf5b0e365211730885de0e5d9c81a3fff6096cdc877caba043b5a2d +3d673bfc3cf0df5e2554d872a0000b4f738157828a15cdb187e46192564cfe23
diff --git a/a/content_digest b/N2/content_digest index 10c9795..aa33bf0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH v4 5/7] ARM: dts: meson6: switch to new bindings for UART nodes\0" "Date\0Mon, 12 Jun 2017 11:42:57 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote:\n" @@ -62,4 +62,4 @@ "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" > +}; -578ef7f46bf5b0e365211730885de0e5d9c81a3fff6096cdc877caba043b5a2d +85680152c6f2300cb091240321d2e5a6e8d861e2eb0af9093b9871185135d515
diff --git a/a/1.txt b/N3/1.txt index 30c2e89..7fb9924 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -8,17 +8,17 @@ Shouldn't this patch be squashed with patch 4 ? > --- -> ?arch/arm/boot/dts/meson6.dtsi | 28 ++++++++++++++++++++++++++++ -> ?1 file changed, 28 insertions(+) +> arch/arm/boot/dts/meson6.dtsi | 28 ++++++++++++++++++++++++++++ +> 1 file changed, 28 insertions(+) > > diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi > index b0fc91f..a334fbe 100644 > --- a/arch/arm/boot/dts/meson6.dtsi > +++ b/arch/arm/boot/dts/meson6.dtsi > @@ -70,9 +70,37 @@ -> ? }; -> ? }; -> ? +> }; +> }; +> > + xtal: xtal-clk { > + compatible = "fixed-clock"; > + clock-frequency = <24000000>; @@ -26,12 +26,12 @@ Shouldn't this patch be squashed with patch 4 ? > + #clock-cells = <0>; > + }; > + -> ? clk81: clk at 0 { -> ? #clock-cells = <0>; -> ? compatible = "fixed-clock"; -> ? clock-frequency = <200000000>; -> ? }; -> ?}; /* end of / */ +> clk81: clk@0 { +> #clock-cells = <0>; +> compatible = "fixed-clock"; +> clock-frequency = <200000000>; +> }; +> }; /* end of / */ > + > + > +&uart_AO { diff --git a/a/content_digest b/N3/content_digest index 10c9795..0a62217 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,9 +1,17 @@ "ref\01497001756-942-1-git-send-email-narmstrong@baylibre.com\0" "ref\01497001756-942-6-git-send-email-narmstrong@baylibre.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v4 5/7] ARM: dts: meson6: switch to new bindings for UART nodes\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v4 5/7] ARM: dts: meson6: switch to new bindings for UART nodes\0" "Date\0Mon, 12 Jun 2017 11:42:57 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Neil Armstrong <narmstrong@baylibre.com>" + gregkh@linuxfoundation.org + " khilman@baylibre.com\0" + "Cc\0hgkr.klein@gmail.com" + linux-serial@vger.kernel.org + linux-amlogic@lists.infradead.org + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + " devicetree@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote:\n" @@ -16,17 +24,17 @@ "\n" "\n" "> ---\n" - "> ?arch/arm/boot/dts/meson6.dtsi | 28 ++++++++++++++++++++++++++++\n" - "> ?1 file changed, 28 insertions(+)\n" + "> \302\240arch/arm/boot/dts/meson6.dtsi | 28 ++++++++++++++++++++++++++++\n" + "> \302\2401 file changed, 28 insertions(+)\n" "> \n" "> diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi\n" "> index b0fc91f..a334fbe 100644\n" "> --- a/arch/arm/boot/dts/meson6.dtsi\n" "> +++ b/arch/arm/boot/dts/meson6.dtsi\n" "> @@ -70,9 +70,37 @@\n" - "> ?\t\t};\n" - "> ?\t};\n" - "> ?\n" + "> \302\240\t\t};\n" + "> \302\240\t};\n" + "> \302\240\n" "> +\txtal: xtal-clk {\n" "> +\t\tcompatible = \"fixed-clock\";\n" "> +\t\tclock-frequency = <24000000>;\n" @@ -34,12 +42,12 @@ "> +\t\t#clock-cells = <0>;\n" "> +\t};\n" "> +\n" - "> ?\tclk81: clk at 0 {\n" - "> ?\t\t#clock-cells = <0>;\n" - "> ?\t\tcompatible = \"fixed-clock\";\n" - "> ?\t\tclock-frequency = <200000000>;\n" - "> ?\t};\n" - "> ?}; /* end of / */\n" + "> \302\240\tclk81: clk@0 {\n" + "> \302\240\t\t#clock-cells = <0>;\n" + "> \302\240\t\tcompatible = \"fixed-clock\";\n" + "> \302\240\t\tclock-frequency = <200000000>;\n" + "> \302\240\t};\n" + "> \302\240}; /* end of / */\n" "> +\n" "> +\n" "> +&uart_AO {\n" @@ -62,4 +70,4 @@ "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" > +}; -578ef7f46bf5b0e365211730885de0e5d9c81a3fff6096cdc877caba043b5a2d +5ef8834149b194096599872ba0d6985919b3cb1ea1c5701dacafc47b9dc11210
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.