From: jbrunet@baylibre.com (Jerome Brunet)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH 3/3] ARM: dts: meson8: add and use the real clock controller
Date: Sun, 04 Jun 2017 22:20:38 +0200 [thread overview]
Message-ID: <1496607638.3552.20.camel@baylibre.com> (raw)
In-Reply-To: <20170604183341.21417-4-martin.blumenstingl@googlemail.com>
On Sun, 2017-06-04 at 20:33 +0200, Martin Blumenstingl wrote:
> This removes the dummy clk81 gate and replaces it with the actual clock
> controller's CLKID_CLK81. This will also allow us to pass the real clock
> IDs to all devices where the clock is controlled by clkc in the future.
>
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
This is going in the right direction and at least align meson8 and meson8b.
Acked-by: Jerome Brunet <jbrunet@baylibre.com>
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(-)
>
> 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.
> ? */
> ?
> +#include <dt-bindings/clock/meson8b-clkc.h>
> ?#include <dt-bindings/gpio/meson8-gpio.h>
> ?/include/ "meson.dtsi"
> ?
> @@ -82,13 +83,6 @@
> ? reg = <0x203>;
> ? };
> ? };
> -
> - clk81: clk at 0 {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <141666666>;
> - };
> -
> ?}; /* end of / */
> ?
> ?&aobus {
> @@ -126,6 +120,12 @@
> ?};
> ?
> ?&cbus {
> + clkc: clock-controller at 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>;
> @@ -172,20 +172,20 @@
> ?};
> ?
> ?ðmac {
> - clocks = <&clk81>;
> + clocks = <&clkc CLKID_CLK81>;
> ? clock-names = "stmmaceth";
> ?};
> ?
> ?&i2c_AO {
> - clocks = <&clk81>;
> + clocks = <&clkc CLKID_CLK81>;
> ?};
> ?
> ?&i2c_A {
> - clocks = <&clk81>;
> + clocks = <&clkc CLKID_CLK81>;
> ?};
> ?
> ?&i2c_B {
> - clocks = <&clk81>;
> + clocks = <&clkc CLKID_CLK81>;
> ?};
> ?
> ?&L2 {
> @@ -195,21 +195,21 @@
> ?};
> ?
> ?&spifc {
> - clocks = <&clk81>;
> + clocks = <&clkc CLKID_CLK81>;
> ?};
> ?
> ?&uart_AO {
> - clocks = <&clk81>;
> + clocks = <&clkc CLKID_CLK81>;
> ?};
> ?
> ?&uart_A {
> - clocks = <&clk81>;
> + clocks = <&clkc CLKID_CLK81>;
> ?};
> ?
> ?&uart_B {
> - clocks = <&clk81>;
> + clocks = <&clkc CLKID_CLK81>;
> ?};
> ?
> ?&uart_C {
> - clocks = <&clk81>;
> + clocks = <&clkc CLKID_CLK81>;
> ?};
next prev parent reply other threads:[~2017-06-04 20:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-04 18:33 [PATCH 0/3] use the Meson8b clock controller driver on Meson8 SoCs Martin Blumenstingl
2017-06-04 18:33 ` [PATCH 1/3] clk: meson: meson8b: add compatibles for Meson8 and Meson8m2 Martin Blumenstingl
2017-06-04 19:58 ` Jerome Brunet
2017-06-04 22:27 ` Martin Blumenstingl
2017-06-05 8:23 ` Jerome Brunet
2017-06-08 22:44 ` Rob Herring
2017-06-09 18:13 ` Kevin Hilman
2017-06-12 7:40 ` Jerome Brunet
2017-06-04 18:33 ` [PATCH 2/3] arm: meson: select the clock controller for Meson8 Martin Blumenstingl
2017-06-04 20:02 ` Jerome Brunet
2017-06-09 18:21 ` Kevin Hilman
2017-06-04 18:33 ` [PATCH 3/3] ARM: dts: meson8: add and use the real clock controller Martin Blumenstingl
2017-06-04 20:20 ` Jerome Brunet [this message]
2017-06-04 22:13 ` Martin Blumenstingl
2017-06-07 11:55 ` Neil Armstrong
2017-06-09 18:22 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1496607638.3552.20.camel@baylibre.com \
--to=jbrunet@baylibre.com \
--cc=linus-amlogic@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).