diff for duplicates of <1496607638.3552.20.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index bfd4340..95a9a8c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,97 +13,97 @@ Later on, I'm wondering if some of these clock assignments should be moved to meson.dtsi ? meson8.dtsi and meson8b.dtsi look very similar > --- -> ?arch/arm/boot/dts/meson8.dtsi | 32 ++++++++++++++++---------------- -> ?1 file changed, 16 insertions(+), 16 deletions(-) +> arch/arm/boot/dts/meson8.dtsi | 32 ++++++++++++++++---------------- +> 1 file changed, 16 insertions(+), 16 deletions(-) > > diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi > index 6993077331c7..9b0b3ddbb17e 100644 > --- a/arch/arm/boot/dts/meson8.dtsi > +++ b/arch/arm/boot/dts/meson8.dtsi > @@ -43,6 +43,7 @@ -> ? *?????OTHER DEALINGS IN THE SOFTWARE. -> ? */ -> ? +> * OTHER DEALINGS IN THE SOFTWARE. +> */ +> > +#include <dt-bindings/clock/meson8b-clkc.h> -> ?#include <dt-bindings/gpio/meson8-gpio.h> -> ?/include/ "meson.dtsi" -> ? +> #include <dt-bindings/gpio/meson8-gpio.h> +> /include/ "meson.dtsi" +> > @@ -82,13 +83,6 @@ -> ? reg = <0x203>; -> ? }; -> ? }; +> reg = <0x203>; +> }; +> }; > - -> - clk81: clk at 0 { +> - clk81: clk@0 { > - #clock-cells = <0>; > - compatible = "fixed-clock"; > - clock-frequency = <141666666>; > - }; > - -> ?}; /* end of / */ -> ? -> ?&aobus { +> }; /* end of / */ +> +> &aobus { > @@ -126,6 +120,12 @@ -> ?}; -> ? -> ?&cbus { -> + clkc: clock-controller at 4000 { +> }; +> +> &cbus { +> + clkc: clock-controller@4000 { > + #clock-cells = <1>; > + compatible = "amlogic,meson8-clkc"; > + reg = <0x8000 0x4>, <0x4000 0x460>; > + }; > + -> ? pinctrl_cbus: pinctrl at 9880 { -> ? compatible = "amlogic,meson8-cbus-pinctrl"; -> ? reg = <0x9880 0x10>; +> pinctrl_cbus: pinctrl@9880 { +> compatible = "amlogic,meson8-cbus-pinctrl"; +> reg = <0x9880 0x10>; > @@ -172,20 +172,20 @@ -> ?}; -> ? -> ?ðmac { +> }; +> +> ðmac { > - clocks = <&clk81>; > + clocks = <&clkc CLKID_CLK81>; -> ? clock-names = "stmmaceth"; -> ?}; -> ? -> ?&i2c_AO { +> clock-names = "stmmaceth"; +> }; +> +> &i2c_AO { > - clocks = <&clk81>; > + clocks = <&clkc CLKID_CLK81>; -> ?}; -> ? -> ?&i2c_A { +> }; +> +> &i2c_A { > - clocks = <&clk81>; > + clocks = <&clkc CLKID_CLK81>; -> ?}; -> ? -> ?&i2c_B { +> }; +> +> &i2c_B { > - clocks = <&clk81>; > + clocks = <&clkc CLKID_CLK81>; -> ?}; -> ? -> ?&L2 { +> }; +> +> &L2 { > @@ -195,21 +195,21 @@ -> ?}; -> ? -> ?&spifc { +> }; +> +> &spifc { > - clocks = <&clk81>; > + clocks = <&clkc CLKID_CLK81>; -> ?}; -> ? -> ?&uart_AO { +> }; +> +> &uart_AO { > - clocks = <&clk81>; > + clocks = <&clkc CLKID_CLK81>; -> ?}; -> ? -> ?&uart_A { +> }; +> +> &uart_A { > - clocks = <&clk81>; > + clocks = <&clkc CLKID_CLK81>; -> ?}; -> ? -> ?&uart_B { +> }; +> +> &uart_B { > - clocks = <&clk81>; > + clocks = <&clkc CLKID_CLK81>; -> ?}; -> ? -> ?&uart_C { +> }; +> +> &uart_C { > - clocks = <&clk81>; > + clocks = <&clkc CLKID_CLK81>; -> ?}; +> }; diff --git a/a/content_digest b/N1/content_digest index e918c5f..7bde8b8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,21 @@ "ref\020170604183341.21417-1-martin.blumenstingl@googlemail.com\0" "ref\020170604183341.21417-4-martin.blumenstingl@googlemail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH 3/3] ARM: dts: meson8: add and use the real clock controller\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH 3/3] ARM: dts: meson8: add and use the real clock controller\0" "Date\0Sun, 04 Jun 2017 22:20:38 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Martin Blumenstingl <martin.blumenstingl@googlemail.com>" + narmstrong@baylibre.com + linux-amlogic@lists.infradead.org + " linux-clk@vger.kernel.org\0" + "Cc\0mturquette@baylibre.com" + sboyd@codeaurora.org + robh+dt@kernel.org + mark.rutland@arm.com + carlo@caione.org + khilman@baylibre.com + linux@armlinux.org.uk + devicetree@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Sun, 2017-06-04 at 20:33 +0200, Martin Blumenstingl wrote:\n" @@ -21,99 +33,99 @@ "meson.dtsi ? meson8.dtsi and meson8b.dtsi look very similar \n" "\n" "> ---\n" - "> ?arch/arm/boot/dts/meson8.dtsi | 32 ++++++++++++++++----------------\n" - "> ?1 file changed, 16 insertions(+), 16 deletions(-)\n" + "> \302\240arch/arm/boot/dts/meson8.dtsi | 32 ++++++++++++++++----------------\n" + "> \302\2401 file changed, 16 insertions(+), 16 deletions(-)\n" "> \n" "> diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi\n" "> index 6993077331c7..9b0b3ddbb17e 100644\n" "> --- a/arch/arm/boot/dts/meson8.dtsi\n" "> +++ b/arch/arm/boot/dts/meson8.dtsi\n" "> @@ -43,6 +43,7 @@\n" - "> ? *?????OTHER DEALINGS IN THE SOFTWARE.\n" - "> ? */\n" - "> ?\n" + "> \302\240 *\302\240\302\240\302\240\302\240\302\240OTHER DEALINGS IN THE SOFTWARE.\n" + "> \302\240 */\n" + "> \302\240\n" "> +#include <dt-bindings/clock/meson8b-clkc.h>\n" - "> ?#include <dt-bindings/gpio/meson8-gpio.h>\n" - "> ?/include/ \"meson.dtsi\"\n" - "> ?\n" + "> \302\240#include <dt-bindings/gpio/meson8-gpio.h>\n" + "> \302\240/include/ \"meson.dtsi\"\n" + "> \302\240\n" "> @@ -82,13 +83,6 @@\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" - "> -\tclk81: clk at 0 {\n" + "> -\tclk81: clk@0 {\n" "> -\t\t#clock-cells = <0>;\n" "> -\t\tcompatible = \"fixed-clock\";\n" "> -\t\tclock-frequency = <141666666>;\n" "> -\t};\n" "> -\n" - "> ?}; /* end of / */\n" - "> ?\n" - "> ?&aobus {\n" + "> \302\240}; /* end of / */\n" + "> \302\240\n" + "> \302\240&aobus {\n" "> @@ -126,6 +120,12 @@\n" - "> ?};\n" - "> ?\n" - "> ?&cbus {\n" - "> +\tclkc: clock-controller at 4000 {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&cbus {\n" + "> +\tclkc: clock-controller@4000 {\n" "> +\t\t#clock-cells = <1>;\n" "> +\t\tcompatible = \"amlogic,meson8-clkc\";\n" "> +\t\treg = <0x8000 0x4>, <0x4000 0x460>;\n" "> +\t};\n" "> +\n" - "> ?\tpinctrl_cbus: pinctrl at 9880 {\n" - "> ?\t\tcompatible = \"amlogic,meson8-cbus-pinctrl\";\n" - "> ?\t\treg = <0x9880 0x10>;\n" + "> \302\240\tpinctrl_cbus: pinctrl@9880 {\n" + "> \302\240\t\tcompatible = \"amlogic,meson8-cbus-pinctrl\";\n" + "> \302\240\t\treg = <0x9880 0x10>;\n" "> @@ -172,20 +172,20 @@\n" - "> ?};\n" - "> ?\n" - "> ?ðmac {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240ðmac {\n" "> -\tclocks = <&clk81>;\n" "> +\tclocks = <&clkc CLKID_CLK81>;\n" - "> ?\tclock-names = \"stmmaceth\";\n" - "> ?};\n" - "> ?\n" - "> ?&i2c_AO {\n" + "> \302\240\tclock-names = \"stmmaceth\";\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&i2c_AO {\n" "> -\tclocks = <&clk81>;\n" "> +\tclocks = <&clkc CLKID_CLK81>;\n" - "> ?};\n" - "> ?\n" - "> ?&i2c_A {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&i2c_A {\n" "> -\tclocks = <&clk81>;\n" "> +\tclocks = <&clkc CLKID_CLK81>;\n" - "> ?};\n" - "> ?\n" - "> ?&i2c_B {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&i2c_B {\n" "> -\tclocks = <&clk81>;\n" "> +\tclocks = <&clkc CLKID_CLK81>;\n" - "> ?};\n" - "> ?\n" - "> ?&L2 {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&L2 {\n" "> @@ -195,21 +195,21 @@\n" - "> ?};\n" - "> ?\n" - "> ?&spifc {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&spifc {\n" "> -\tclocks = <&clk81>;\n" "> +\tclocks = <&clkc CLKID_CLK81>;\n" - "> ?};\n" - "> ?\n" - "> ?&uart_AO {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_AO {\n" "> -\tclocks = <&clk81>;\n" "> +\tclocks = <&clkc CLKID_CLK81>;\n" - "> ?};\n" - "> ?\n" - "> ?&uart_A {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_A {\n" "> -\tclocks = <&clk81>;\n" "> +\tclocks = <&clkc CLKID_CLK81>;\n" - "> ?};\n" - "> ?\n" - "> ?&uart_B {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_B {\n" "> -\tclocks = <&clk81>;\n" "> +\tclocks = <&clkc CLKID_CLK81>;\n" - "> ?};\n" - "> ?\n" - "> ?&uart_C {\n" + "> \302\240};\n" + "> \302\240\n" + "> \302\240&uart_C {\n" "> -\tclocks = <&clk81>;\n" "> +\tclocks = <&clkc CLKID_CLK81>;\n" - > ?}; + "> \302\240};" -54086f8e5a18b4ec74d814f8c626ade9f68cc1d29a2cb9a8812eec07f3926d43 +fb47f72429550c641a55c3d31a4d4280f046135bdfebbc805356b4846d127209
diff --git a/a/content_digest b/N2/content_digest index e918c5f..5694999 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH 3/3] ARM: dts: meson8: add and use the real clock controller\0" "Date\0Sun, 04 Jun 2017 22:20:38 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Sun, 2017-06-04 at 20:33 +0200, Martin Blumenstingl wrote:\n" @@ -116,4 +116,4 @@ "> +\tclocks = <&clkc CLKID_CLK81>;\n" > ?}; -54086f8e5a18b4ec74d814f8c626ade9f68cc1d29a2cb9a8812eec07f3926d43 +609ffc27f4300eaa77267223a402ff4120bb92dd2cb91be3256be9ef45e86b65
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.