From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jerome Brunet <jbrunet@baylibre.com>
Subject: Re: [PATCH 3/3] ARM: dts: meson8: add and use the real clock
 controller
Date: Sun, 04 Jun 2017 22:20:38 +0200
Message-ID: <1496607638.3552.20.camel@baylibre.com>
References: <20170604183341.21417-1-martin.blumenstingl@googlemail.com>
         <20170604183341.21417-4-martin.blumenstingl@googlemail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
Return-path: <linux-clk-owner@vger.kernel.org>
In-Reply-To: <20170604183341.21417-4-martin.blumenstingl@googlemail.com>
Sender: linux-clk-owner@vger.kernel.org
To: Martin Blumenstingl <martin.blumenstingl@googlemail.com>, narmstrong@baylibre.com, linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org
Cc: mturquette@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
List-Id: devicetree@vger.kernel.org

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@0 {
> -		#clock-cells = <0>;
> -		compatible = "fixed-clock";
> -		clock-frequency = <141666666>;
> -	};
> -
>  }; /* end of / */
>  
>  &aobus {
> @@ -126,6 +120,12 @@
>  };
>  
>  &cbus {
> +	clkc: clock-controller@4000 {
> +		#clock-cells = <1>;
> +		compatible = "amlogic,meson8-clkc";
> +		reg = <0x8000 0x4>, <0x4000 0x460>;
> +	};
> +
>  	pinctrl_cbus: pinctrl@9880 {
>  		compatible = "amlogic,meson8-cbus-pinctrl";
>  		reg = <0x9880 0x10>;
> @@ -172,20 +172,20 @@
>  };
>  
>  &ethmac {
> -	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>;
>  };