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@xxxxxxxxxxxxxx>
This is going in the right direction and at least align meson8 and meson8b.
Acked-by: Jerome Brunet <jbrunet@xxxxxxxxxxxx>
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 @@
> };
>
> ð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>;
> };
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
