Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752049AbdFTOYM (ORCPT ); Tue, 20 Jun 2017 10:24:12 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:55286 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751025AbdFTOYK (ORCPT ); Tue, 20 Jun 2017 10:24:10 -0400 From: Gregory CLEMENT To: Stephen Boyd Cc: Mike Turquette , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Thomas Petazzoni , linux-arm-kernel@lists.infradead.org, Rob Herring , devicetree@vger.kernel.org, Nadav Haklai , Kostya Porotchkin , Neta Zur Hershkovits , Marcin Wojtas , Omri Itach , Shadi Ammouri Subject: Re: [PATCH v3 9/9] arm64: dts: marvell: use new binding for the system controller on cp110 References: <9c5807cafb03413f4318f6c95a2e093bd9cdcdcf.1496328934.git-series.gregory.clement@free-electrons.com> Date: Tue, 20 Jun 2017 16:23:58 +0200 In-Reply-To: <9c5807cafb03413f4318f6c95a2e093bd9cdcdcf.1496328934.git-series.gregory.clement@free-electrons.com> (Gregory CLEMENT's message of "Thu, 1 Jun 2017 16:55:42 +0200") Message-ID: <87a8524u0x.fsf@free-electrons.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9393 Lines: 332 Hi, On jeu., juin 01 2017, Gregory CLEMENT wrote: > The new binding for the system controller on cp110 moved the clock > controller into a subnode. This preliminary step will allow to add gpio > and pinctrl subnodes. > > Reviewed-by: Thomas Petazzoni > Signed-off-by: Gregory CLEMENT Applied on mvebu/dt64 and while doing it, fixed the clock introduced in the patches merged since the first version of this patch. Gregory > --- > arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 41 ++++++------- > arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 35 +++++------ > 2 files changed, 41 insertions(+), 35 deletions(-) > > diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi > index a0f57a8e5dcb..96a4ff75b3b0 100644 > --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi > @@ -62,7 +62,7 @@ > cpm_ethernet: ethernet@0 { > compatible = "marvell,armada-7k-pp22"; > reg = <0x0 0x100000>, <0x129000 0xb000>; > - clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>, <&cpm_syscon0 1 5>; > + clocks = <&cpm_clk 1 3>, <&cpm_clk 1 9>, <&cpm_clk 1 5>; > clock-names = "pp_clk", "gop_clk", "mg_clk"; > status = "disabled"; > dma-coherent; > @@ -97,10 +97,13 @@ > }; > > cpm_syscon0: system-controller@440000 { > - compatible = "marvell,cp110-system-controller0", > - "syscon"; > + compatible = "syscon", "simple-mfd"; > reg = <0x440000 0x1000>; > - #clock-cells = <2>; > + > + cpm_clk: clock { > + compatible = "marvell,cp110-clock"; > + #clock-cells = <2>; > + }; > }; > > cpm_rtc: rtc@284000 { > @@ -115,7 +118,7 @@ > "generic-ahci"; > reg = <0x540000 0x30000>; > interrupts = ; > - clocks = <&cpm_syscon0 1 15>; > + clocks = <&cpm_clk 1 15>; > status = "disabled"; > }; > > @@ -125,7 +128,7 @@ > reg = <0x500000 0x4000>; > dma-coherent; > interrupts = ; > - clocks = <&cpm_syscon0 1 22>; > + clocks = <&cpm_clk 1 22>; > status = "disabled"; > }; > > @@ -135,7 +138,7 @@ > reg = <0x510000 0x4000>; > dma-coherent; > interrupts = ; > - clocks = <&cpm_syscon0 1 23>; > + clocks = <&cpm_clk 1 23>; > status = "disabled"; > }; > > @@ -145,7 +148,7 @@ > <0x6b0000 0x1000>; > dma-coherent; > msi-parent = <&gic_v2m0>; > - clocks = <&cpm_syscon0 1 8>; > + clocks = <&cpm_clk 1 8>; > }; > > cpm_xor1: xor@6c0000 { > @@ -154,7 +157,7 @@ > <0x6d0000 0x1000>; > dma-coherent; > msi-parent = <&gic_v2m0>; > - clocks = <&cpm_syscon0 1 7>; > + clocks = <&cpm_clk 1 7>; > }; > > cpm_spi0: spi@700600 { > @@ -163,7 +166,7 @@ > #address-cells = <0x1>; > #size-cells = <0x0>; > cell-index = <1>; > - clocks = <&cpm_syscon0 1 21>; > + clocks = <&cpm_clk 1 21>; > status = "disabled"; > }; > > @@ -173,7 +176,7 @@ > #address-cells = <1>; > #size-cells = <0>; > cell-index = <2>; > - clocks = <&cpm_syscon0 1 21>; > + clocks = <&cpm_clk 1 21>; > status = "disabled"; > }; > > @@ -183,7 +186,7 @@ > #address-cells = <1>; > #size-cells = <0>; > interrupts = ; > - clocks = <&cpm_syscon0 1 21>; > + clocks = <&cpm_clk 1 21>; > status = "disabled"; > }; > > @@ -193,7 +196,7 @@ > #address-cells = <1>; > #size-cells = <0>; > interrupts = ; > - clocks = <&cpm_syscon0 1 21>; > + clocks = <&cpm_clk 1 21>; > status = "disabled"; > }; > > @@ -201,7 +204,7 @@ > compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76"; > reg = <0x760000 0x7d>; > interrupts = ; > - clocks = <&cpm_syscon0 1 25>; > + clocks = <&cpm_clk 1 25>; > status = "okay"; > }; > > @@ -210,7 +213,7 @@ > reg = <0x780000 0x300>; > interrupts = ; > clock-names = "core"; > - clocks = <&cpm_syscon0 1 4>; > + clocks = <&cpm_clk 1 4>; > dma-coherent; > status = "disabled"; > }; > @@ -227,7 +230,7 @@ > ; > interrupt-names = "mem", "ring0", "ring1", > "ring2", "ring3", "eip"; > - clocks = <&cpm_syscon0 1 26>; > + clocks = <&cpm_clk 1 26>; > status = "disabled"; > }; > }; > @@ -254,7 +257,7 @@ > interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; > interrupts = ; > num-lanes = <1>; > - clocks = <&cpm_syscon0 1 13>; > + clocks = <&cpm_clk 1 13>; > status = "disabled"; > }; > > @@ -281,7 +284,7 @@ > interrupts = ; > > num-lanes = <1>; > - clocks = <&cpm_syscon0 1 11>; > + clocks = <&cpm_clk 1 11>; > status = "disabled"; > }; > > @@ -308,7 +311,7 @@ > interrupts = ; > > num-lanes = <1>; > - clocks = <&cpm_syscon0 1 12>; > + clocks = <&cpm_clk 1 12>; > status = "disabled"; > }; > }; > diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi > index 9584bc8d8b3f..48a658aa5b32 100644 > --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi > @@ -104,10 +104,13 @@ > }; > > cps_syscon0: system-controller@440000 { > - compatible = "marvell,cp110-system-controller0", > - "syscon"; > + compatible = "syscon", "simple-mfd"; > reg = <0x440000 0x1000>; > - #clock-cells = <2>; > + > + cps_clk: clock { > + compatible = "marvell,cp110-clock"; > + #clock-cells = <2>; > + }; > }; > > cps_sata0: sata@540000 { > @@ -115,7 +118,7 @@ > "generic-ahci"; > reg = <0x540000 0x30000>; > interrupts = ; > - clocks = <&cps_syscon0 1 15>; > + clocks = <&cps_clk 1 15>; > status = "disabled"; > }; > > @@ -125,7 +128,7 @@ > reg = <0x500000 0x4000>; > dma-coherent; > interrupts = ; > - clocks = <&cps_syscon0 1 22>; > + clocks = <&cps_clk 1 22>; > status = "disabled"; > }; > > @@ -135,7 +138,7 @@ > reg = <0x510000 0x4000>; > dma-coherent; > interrupts = ; > - clocks = <&cps_syscon0 1 23>; > + clocks = <&cps_clk 1 23>; > status = "disabled"; > }; > > @@ -145,7 +148,7 @@ > <0x6b0000 0x1000>; > dma-coherent; > msi-parent = <&gic_v2m0>; > - clocks = <&cps_syscon0 1 8>; > + clocks = <&cps_clk 1 8>; > }; > > cps_xor1: xor@6c0000 { > @@ -154,7 +157,7 @@ > <0x6d0000 0x1000>; > dma-coherent; > msi-parent = <&gic_v2m0>; > - clocks = <&cps_syscon0 1 7>; > + clocks = <&cps_clk 1 7>; > }; > > cps_spi0: spi@700600 { > @@ -163,7 +166,7 @@ > #address-cells = <0x1>; > #size-cells = <0x0>; > cell-index = <3>; > - clocks = <&cps_syscon0 1 21>; > + clocks = <&cps_clk 1 21>; > status = "disabled"; > }; > > @@ -173,7 +176,7 @@ > #address-cells = <1>; > #size-cells = <0>; > cell-index = <4>; > - clocks = <&cps_syscon0 1 21>; > + clocks = <&cps_clk 1 21>; > status = "disabled"; > }; > > @@ -183,7 +186,7 @@ > #address-cells = <1>; > #size-cells = <0>; > interrupts = ; > - clocks = <&cps_syscon0 1 21>; > + clocks = <&cps_clk 1 21>; > status = "disabled"; > }; > > @@ -193,7 +196,7 @@ > #address-cells = <1>; > #size-cells = <0>; > interrupts = ; > - clocks = <&cps_syscon0 1 21>; > + clocks = <&cps_clk 1 21>; > status = "disabled"; > }; > > @@ -201,7 +204,7 @@ > compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76"; > reg = <0x760000 0x7d>; > interrupts = ; > - clocks = <&cps_syscon0 1 25>; > + clocks = <&cps_clk 1 25>; > status = "okay"; > }; > > @@ -244,7 +247,7 @@ > interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>; > interrupts = ; > num-lanes = <1>; > - clocks = <&cps_syscon0 1 13>; > + clocks = <&cps_clk 1 13>; > status = "disabled"; > }; > > @@ -271,7 +274,7 @@ > interrupts = ; > > num-lanes = <1>; > - clocks = <&cps_syscon0 1 11>; > + clocks = <&cps_clk 1 11>; > status = "disabled"; > }; > > @@ -298,7 +301,7 @@ > interrupts = ; > > num-lanes = <1>; > - clocks = <&cps_syscon0 1 12>; > + clocks = <&cps_clk 1 12>; > status = "disabled"; > }; > }; > -- > git-series 0.9.1 -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com