diff for duplicates of <1497258823.3086.6.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index aac5c38..f80fa16 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,15 +2,15 @@ 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> > --- -> ?arch/arm/boot/dts/meson8.dtsi | 23 +++++++++++++++++++---- -> ?1 file changed, 19 insertions(+), 4 deletions(-) +> arch/arm/boot/dts/meson8.dtsi | 23 +++++++++++++++++++---- +> 1 file changed, 19 insertions(+), 4 deletions(-) I think this is clashing with the recent change from Martin on meson8 clock -driver. Kevin just applied it :? +driver. Kevin just applied it : -https://lkml.kernel.org/r/m2d1ad9g38.fsf at baylibre.com +https://lkml.kernel.org/r/m2d1ad9g38.fsf-rdvid1DuHRBWk0Htik3J/w@public.gmane.org <&clk81> no longer exists ... @@ -20,9 +20,9 @@ https://lkml.kernel.org/r/m2d1ad9g38.fsf at baylibre.com > --- a/arch/arm/boot/dts/meson8.dtsi > +++ b/arch/arm/boot/dts/meson8.dtsi > @@ -83,6 +83,13 @@ -> ? }; -> ? }; -> ? +> }; +> }; +> > + xtal: xtal-clk { > + compatible = "fixed-clock"; > + clock-frequency = <24000000>; @@ -30,36 +30,41 @@ https://lkml.kernel.org/r/m2d1ad9g38.fsf at baylibre.com > + #clock-cells = <0>; > + }; > + -> ? clk81: clk at 0 { -> ? #clock-cells = <0>; -> ? compatible = "fixed-clock"; +> clk81: clk@0 { +> #clock-cells = <0>; +> compatible = "fixed-clock"; > @@ -199,17 +206,25 @@ -> ?}; -> ? -> ?&uart_AO { +> }; +> +> &uart_AO { > - clocks = <&clk81>; > + compatible = "amlogic,meson8-uart", "amlogic,meson-ao-uart"; > + clocks = <&xtal>, <&clk81>, <&clk81>; > + clock-names = "xtal", "pclk", "baud"; -> ?}; -> ? -> ?&uart_A { +> }; +> +> &uart_A { > - clocks = <&clk81>; > + compatible = "amlogic,meson8-uart"; > + clocks = <&xtal>, <&clk81>, <&clk81>; > + clock-names = "xtal", "pclk", "baud"; -> ?}; -> ? -> ?&uart_B { +> }; +> +> &uart_B { > - clocks = <&clk81>; > + compatible = "amlogic,meson8-uart"; > + clocks = <&xtal>, <&clk81>, <&clk81>; > + clock-names = "xtal", "pclk", "baud"; -> ?}; -> ? -> ?&uart_C { +> }; +> +> &uart_C { > - clocks = <&clk81>; > + compatible = "amlogic,meson8-uart"; > + 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 2bf2521..67f4314 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,33 @@ "ref\01497001756-942-1-git-send-email-narmstrong@baylibre.com\0" "ref\01497001756-942-7-git-send-email-narmstrong@baylibre.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v4 6/7] ARM: dts: meson8: switch to new bindings for UART nodes\0" + "ref\01497001756-942-7-git-send-email-narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org\0" + "From\0Jerome Brunet <jbrunet-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>\0" + "Subject\0Re: [PATCH v4 6/7] ARM: dts: meson8: switch to new bindings for UART nodes\0" "Date\0Mon, 12 Jun 2017 11:13:43 +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" - "> ?arch/arm/boot/dts/meson8.dtsi | 23 +++++++++++++++++++----\n" - "> ?1 file changed, 19 insertions(+), 4 deletions(-)\n" + "> \302\240arch/arm/boot/dts/meson8.dtsi | 23 +++++++++++++++++++----\n" + "> \302\2401 file changed, 19 insertions(+), 4 deletions(-)\n" "\n" "I think this is clashing with the recent change from Martin on meson8 clock\n" - "driver. Kevin just applied it :?\n" + "driver. Kevin just applied it :\302\240\n" "\n" - "https://lkml.kernel.org/r/m2d1ad9g38.fsf at baylibre.com\n" + "https://lkml.kernel.org/r/m2d1ad9g38.fsf-rdvid1DuHRBWk0Htik3J/w@public.gmane.org\n" "\n" "<&clk81> no longer exists ...\n" "\n" @@ -28,9 +37,9 @@ "> --- a/arch/arm/boot/dts/meson8.dtsi\n" "> +++ b/arch/arm/boot/dts/meson8.dtsi\n" "> @@ -83,6 +83,13 @@\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" @@ -38,38 +47,43 @@ "> +\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" + "> \302\240\tclk81: clk@0 {\n" + "> \302\240\t\t#clock-cells = <0>;\n" + "> \302\240\t\tcompatible = \"fixed-clock\";\n" "> @@ -199,17 +206,25 @@\n" - "> ?};\n" - "> ?\n" - "> ?&uart_AO {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_AO {\n" "> -\tclocks = <&clk81>;\n" "> +\tcompatible = \"amlogic,meson8-uart\", \"amlogic,meson-ao-uart\";\n" "> +\tclocks = <&xtal>, <&clk81>, <&clk81>;\n" "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" - "> ?};\n" - "> ?\n" - "> ?&uart_A {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_A {\n" "> -\tclocks = <&clk81>;\n" "> +\tcompatible = \"amlogic,meson8-uart\";\n" "> +\tclocks = <&xtal>, <&clk81>, <&clk81>;\n" "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" - "> ?};\n" - "> ?\n" - "> ?&uart_B {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_B {\n" "> -\tclocks = <&clk81>;\n" "> +\tcompatible = \"amlogic,meson8-uart\";\n" "> +\tclocks = <&xtal>, <&clk81>, <&clk81>;\n" "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" - "> ?};\n" - "> ?\n" - "> ?&uart_C {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_C {\n" "> -\tclocks = <&clk81>;\n" "> +\tcompatible = \"amlogic,meson8-uart\";\n" "> +\tclocks = <&xtal>, <&clk81>, <&clk81>;\n" "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" - > ?}; + "> \302\240};\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 -61d2904f8a8988d706430043941c2cad725c51266e91173f483e04da0648bc27 +7b08c8f727026af4fc86fa075b349f9e943e7acadb7b8f6a0da9f003eb8bfc80
diff --git a/a/content_digest b/N2/content_digest index 2bf2521..39d5105 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH v4 6/7] ARM: dts: meson8: switch to new bindings for UART nodes\0" "Date\0Mon, 12 Jun 2017 11:13:43 +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" @@ -72,4 +72,4 @@ "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" > ?}; -61d2904f8a8988d706430043941c2cad725c51266e91173f483e04da0648bc27 +29a37a98265d1c7979c187288b7bf2468145780b8b06bbc8614f72a33dde0056
diff --git a/a/1.txt b/N3/1.txt index aac5c38..b252312 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -4,13 +4,13 @@ On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote: > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- -> ?arch/arm/boot/dts/meson8.dtsi | 23 +++++++++++++++++++---- -> ?1 file changed, 19 insertions(+), 4 deletions(-) +> arch/arm/boot/dts/meson8.dtsi | 23 +++++++++++++++++++---- +> 1 file changed, 19 insertions(+), 4 deletions(-) I think this is clashing with the recent change from Martin on meson8 clock -driver. Kevin just applied it :? +driver. Kevin just applied it : -https://lkml.kernel.org/r/m2d1ad9g38.fsf at baylibre.com +https://lkml.kernel.org/r/m2d1ad9g38.fsf@baylibre.com <&clk81> no longer exists ... @@ -20,9 +20,9 @@ https://lkml.kernel.org/r/m2d1ad9g38.fsf at baylibre.com > --- a/arch/arm/boot/dts/meson8.dtsi > +++ b/arch/arm/boot/dts/meson8.dtsi > @@ -83,6 +83,13 @@ -> ? }; -> ? }; -> ? +> }; +> }; +> > + xtal: xtal-clk { > + compatible = "fixed-clock"; > + clock-frequency = <24000000>; @@ -30,36 +30,36 @@ https://lkml.kernel.org/r/m2d1ad9g38.fsf at baylibre.com > + #clock-cells = <0>; > + }; > + -> ? clk81: clk at 0 { -> ? #clock-cells = <0>; -> ? compatible = "fixed-clock"; +> clk81: clk@0 { +> #clock-cells = <0>; +> compatible = "fixed-clock"; > @@ -199,17 +206,25 @@ -> ?}; -> ? -> ?&uart_AO { +> }; +> +> &uart_AO { > - clocks = <&clk81>; > + compatible = "amlogic,meson8-uart", "amlogic,meson-ao-uart"; > + clocks = <&xtal>, <&clk81>, <&clk81>; > + clock-names = "xtal", "pclk", "baud"; -> ?}; -> ? -> ?&uart_A { +> }; +> +> &uart_A { > - clocks = <&clk81>; > + compatible = "amlogic,meson8-uart"; > + clocks = <&xtal>, <&clk81>, <&clk81>; > + clock-names = "xtal", "pclk", "baud"; -> ?}; -> ? -> ?&uart_B { +> }; +> +> &uart_B { > - clocks = <&clk81>; > + compatible = "amlogic,meson8-uart"; > + clocks = <&xtal>, <&clk81>, <&clk81>; > + clock-names = "xtal", "pclk", "baud"; -> ?}; -> ? -> ?&uart_C { +> }; +> +> &uart_C { > - clocks = <&clk81>; > + compatible = "amlogic,meson8-uart"; > + clocks = <&xtal>, <&clk81>, <&clk81>; > + clock-names = "xtal", "pclk", "baud"; -> ?}; +> }; diff --git a/a/content_digest b/N3/content_digest index 2bf2521..32170cf 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-7-git-send-email-narmstrong@baylibre.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v4 6/7] ARM: dts: meson8: switch to new bindings for UART nodes\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v4 6/7] ARM: dts: meson8: switch to new bindings for UART nodes\0" "Date\0Mon, 12 Jun 2017 11:13:43 +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" @@ -12,13 +20,13 @@ "> \n" "> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>\n" "> ---\n" - "> ?arch/arm/boot/dts/meson8.dtsi | 23 +++++++++++++++++++----\n" - "> ?1 file changed, 19 insertions(+), 4 deletions(-)\n" + "> \302\240arch/arm/boot/dts/meson8.dtsi | 23 +++++++++++++++++++----\n" + "> \302\2401 file changed, 19 insertions(+), 4 deletions(-)\n" "\n" "I think this is clashing with the recent change from Martin on meson8 clock\n" - "driver. Kevin just applied it :?\n" + "driver. Kevin just applied it :\302\240\n" "\n" - "https://lkml.kernel.org/r/m2d1ad9g38.fsf at baylibre.com\n" + "https://lkml.kernel.org/r/m2d1ad9g38.fsf@baylibre.com\n" "\n" "<&clk81> no longer exists ...\n" "\n" @@ -28,9 +36,9 @@ "> --- a/arch/arm/boot/dts/meson8.dtsi\n" "> +++ b/arch/arm/boot/dts/meson8.dtsi\n" "> @@ -83,6 +83,13 @@\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" @@ -38,38 +46,38 @@ "> +\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" + "> \302\240\tclk81: clk@0 {\n" + "> \302\240\t\t#clock-cells = <0>;\n" + "> \302\240\t\tcompatible = \"fixed-clock\";\n" "> @@ -199,17 +206,25 @@\n" - "> ?};\n" - "> ?\n" - "> ?&uart_AO {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_AO {\n" "> -\tclocks = <&clk81>;\n" "> +\tcompatible = \"amlogic,meson8-uart\", \"amlogic,meson-ao-uart\";\n" "> +\tclocks = <&xtal>, <&clk81>, <&clk81>;\n" "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" - "> ?};\n" - "> ?\n" - "> ?&uart_A {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_A {\n" "> -\tclocks = <&clk81>;\n" "> +\tcompatible = \"amlogic,meson8-uart\";\n" "> +\tclocks = <&xtal>, <&clk81>, <&clk81>;\n" "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" - "> ?};\n" - "> ?\n" - "> ?&uart_B {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_B {\n" "> -\tclocks = <&clk81>;\n" "> +\tcompatible = \"amlogic,meson8-uart\";\n" "> +\tclocks = <&xtal>, <&clk81>, <&clk81>;\n" "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" - "> ?};\n" - "> ?\n" - "> ?&uart_C {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_C {\n" "> -\tclocks = <&clk81>;\n" "> +\tcompatible = \"amlogic,meson8-uart\";\n" "> +\tclocks = <&xtal>, <&clk81>, <&clk81>;\n" "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" - > ?}; + "> \302\240};" -61d2904f8a8988d706430043941c2cad725c51266e91173f483e04da0648bc27 +3560a8da656a4a4801eb083ca0290d12456e9e6f045d75203938a6fbafcf30b7
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.