diff for duplicates of <1497260879.3086.13.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 790b8cc..cf55046 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,17 +4,17 @@ On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote: > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- -> ?arch/arm/boot/dts/meson8b.dtsi | 23 +++++++++++++++++++---- -> ?1 file changed, 19 insertions(+), 4 deletions(-) +> arch/arm/boot/dts/meson8b.dtsi | 23 +++++++++++++++++++---- +> 1 file changed, 19 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi > index d9f116a..651ad4a 100644 > --- a/arch/arm/boot/dts/meson8b.dtsi > +++ b/arch/arm/boot/dts/meson8b.dtsi > @@ -82,6 +82,13 @@ -> ? reg = <0x203>; -> ? }; -> ? }; +> reg = <0x203>; +> }; +> }; > + > + xtal: xtal-clk { > + compatible = "fixed-clock"; @@ -30,36 +30,36 @@ With this handled: Acked-by: Jerome Brunet <jbrunet@baylibre.com> -> ?}; /* end of / */ -> ? -> ?&aobus { +> }; /* end of / */ +> +> &aobus { > @@ -178,17 +185,25 @@ -> ?}; -> ? -> ?&uart_AO { +> }; +> +> &uart_AO { > - clocks = <&clkc CLKID_CLK81>; > + compatible = "amlogic,meson8b-uart", "amlogic,meson-ao-uart"; > + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>; > + clock-names = "xtal", "pclk", "baud"; -> ?}; -> ? -> ?&uart_A { +> }; +> +> &uart_A { > - clocks = <&clkc CLKID_CLK81>; > + compatible = "amlogic,meson8b-uart"; > + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>; > + clock-names = "xtal", "pclk", "baud"; -> ?}; -> ? -> ?&uart_B { +> }; +> +> &uart_B { > - clocks = <&clkc CLKID_CLK81>; > + compatible = "amlogic,meson8b-uart"; > + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>; > + clock-names = "xtal", "pclk", "baud"; -> ?}; -> ? -> ?&uart_C { +> }; +> +> &uart_C { > - clocks = <&clkc CLKID_CLK81>; > + compatible = "amlogic,meson8b-uart"; > + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>; > + clock-names = "xtal", "pclk", "baud"; -> ?}; +> }; diff --git a/a/content_digest b/N1/content_digest index d0e5e43..549f324 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,17 @@ "ref\01497001756-942-1-git-send-email-narmstrong@baylibre.com\0" "ref\01497001756-942-8-git-send-email-narmstrong@baylibre.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v4 7/7] ARM: dts: meson8b: switch to new bindings for UART nodes\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v4 7/7] ARM: dts: meson8b: switch to new bindings for UART nodes\0" "Date\0Mon, 12 Jun 2017 11:47:59 +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,17 +20,17 @@ "> \n" "> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>\n" "> ---\n" - "> ?arch/arm/boot/dts/meson8b.dtsi | 23 +++++++++++++++++++----\n" - "> ?1 file changed, 19 insertions(+), 4 deletions(-)\n" + "> \302\240arch/arm/boot/dts/meson8b.dtsi | 23 +++++++++++++++++++----\n" + "> \302\2401 file changed, 19 insertions(+), 4 deletions(-)\n" "> \n" "> diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi\n" "> index d9f116a..651ad4a 100644\n" "> --- a/arch/arm/boot/dts/meson8b.dtsi\n" "> +++ b/arch/arm/boot/dts/meson8b.dtsi\n" "> @@ -82,6 +82,13 @@\n" - "> ?\t\t\treg = <0x203>;\n" - "> ?\t\t};\n" - "> ?\t};\n" + "> \302\240\t\t\treg = <0x203>;\n" + "> \302\240\t\t};\n" + "> \302\240\t};\n" "> +\n" "> +\txtal: xtal-clk {\n" "> +\t\tcompatible = \"fixed-clock\";\n" @@ -38,38 +46,38 @@ "\n" "Acked-by: Jerome Brunet <jbrunet@baylibre.com>\n" "\n" - "> ?}; /* end of / */\n" - "> ?\n" - "> ?&aobus {\n" + "> \302\240}; /* end of / */\n" + "> \302\240\n" + "> \302\240&aobus {\n" "> @@ -178,17 +185,25 @@\n" - "> ?};\n" - "> ?\n" - "> ?&uart_AO {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_AO {\n" "> -\tclocks = <&clkc CLKID_CLK81>;\n" "> +\tcompatible = \"amlogic,meson8b-uart\", \"amlogic,meson-ao-uart\";\n" "> +\tclocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_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 = <&clkc CLKID_CLK81>;\n" "> +\tcompatible = \"amlogic,meson8b-uart\";\n" "> +\tclocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_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 = <&clkc CLKID_CLK81>;\n" "> +\tcompatible = \"amlogic,meson8b-uart\";\n" "> +\tclocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_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 = <&clkc CLKID_CLK81>;\n" "> +\tcompatible = \"amlogic,meson8b-uart\";\n" "> +\tclocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;\n" "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" - > ?}; + "> \302\240};" -238b28774c2b81f48db2892f34b5f57078c8cc5e58c03c367a57901fba483637 +f3660a88213ad59e1696c031bda7ded198015f50e221e7a93fa7c322b9f300ef
diff --git a/a/content_digest b/N2/content_digest index d0e5e43..8a34de2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH v4 7/7] ARM: dts: meson8b: switch to new bindings for UART nodes\0" "Date\0Mon, 12 Jun 2017 11:47:59 +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" > ?}; -238b28774c2b81f48db2892f34b5f57078c8cc5e58c03c367a57901fba483637 +e19af0f597af331ef7b02d4feca0cd817ad2c4ff6b2ace3ac7c13bf8b31a1ef0
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.