From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760817AbaCULoL (ORCPT ); Fri, 21 Mar 2014 07:44:11 -0400 Received: from top.free-electrons.com ([176.31.233.9]:55819 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1760185AbaCULn4 (ORCPT ); Fri, 21 Mar 2014 07:43:56 -0400 From: Alexandre Belloni To: Sebastian Hesselbarth , Mike Turquette Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Antoine=20T=C3=A9nart?= , Alexandre Belloni Subject: [PATCH 5/5] ARM: berlin/dt: add cpupll and syspll support to BG2 Date: Fri, 21 Mar 2014 12:43:40 +0100 Message-Id: <1395402220-23503-6-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395402220-23503-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1395402220-23503-1-git-send-email-alexandre.belloni@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This also moves the clocks from the clocks container node to the root. Signed-off-by: Alexandre Belloni --- arch/arm/boot/dts/berlin2.dtsi | 56 +++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi index 56a1af2f1052..4b82076ef1ed 100644 --- a/arch/arm/boot/dts/berlin2.dtsi +++ b/arch/arm/boot/dts/berlin2.dtsi @@ -37,24 +37,46 @@ }; }; - clocks { - smclk: sysmgr-clock { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <25000000>; - }; + smclk: sysmgr-clock { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <25000000>; + }; - cfgclk: cfg-clock { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <100000000>; - }; + cfgclk: cfg-clock { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + }; - sysclk: system-clock { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <400000000>; - }; + syspll: syspll { + compatible = "marvell,berlin2-pll"; + clocks = <&smclk>; + #clock-cells = <0>; + reg = <0xf7ea0014 8>; + }; + + cpupll: cpupll { + compatible = "marvell,berlin2-pll"; + clocks = <&smclk>; + #clock-cells = <0>; + reg = <0xf7ea003c 8>; + }; + + cpuclk: cpu-clock { + compatible = "fixed-factor-clock"; + clocks = <&cpupll>; + #clock-cells = <0>; + clock-div = <1>; + clock-mult = <1>; + }; + + twdclk: twdclk { + compatible = "fixed-factor-clock"; + #clock-cells = <0>; + clocks = <&cpuclk>; + clock-mult = <1>; + clock-div = <3>; }; soc { @@ -83,7 +105,7 @@ compatible = "arm,cortex-a9-twd-timer"; reg = <0xad0600 0x20>; interrupts = ; - clocks = <&sysclk>; + clocks = <&twdclk>; }; apb@e80000 { -- 1.8.3.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: alexandre.belloni@free-electrons.com (Alexandre Belloni) Date: Fri, 21 Mar 2014 12:43:40 +0100 Subject: [PATCH 5/5] ARM: berlin/dt: add cpupll and syspll support to BG2 In-Reply-To: <1395402220-23503-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1395402220-23503-1-git-send-email-alexandre.belloni@free-electrons.com> Message-ID: <1395402220-23503-6-git-send-email-alexandre.belloni@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org This also moves the clocks from the clocks container node to the root. Signed-off-by: Alexandre Belloni --- arch/arm/boot/dts/berlin2.dtsi | 56 +++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi index 56a1af2f1052..4b82076ef1ed 100644 --- a/arch/arm/boot/dts/berlin2.dtsi +++ b/arch/arm/boot/dts/berlin2.dtsi @@ -37,24 +37,46 @@ }; }; - clocks { - smclk: sysmgr-clock { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <25000000>; - }; + smclk: sysmgr-clock { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <25000000>; + }; - cfgclk: cfg-clock { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <100000000>; - }; + cfgclk: cfg-clock { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + }; - sysclk: system-clock { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <400000000>; - }; + syspll: syspll { + compatible = "marvell,berlin2-pll"; + clocks = <&smclk>; + #clock-cells = <0>; + reg = <0xf7ea0014 8>; + }; + + cpupll: cpupll { + compatible = "marvell,berlin2-pll"; + clocks = <&smclk>; + #clock-cells = <0>; + reg = <0xf7ea003c 8>; + }; + + cpuclk: cpu-clock { + compatible = "fixed-factor-clock"; + clocks = <&cpupll>; + #clock-cells = <0>; + clock-div = <1>; + clock-mult = <1>; + }; + + twdclk: twdclk { + compatible = "fixed-factor-clock"; + #clock-cells = <0>; + clocks = <&cpuclk>; + clock-mult = <1>; + clock-div = <3>; }; soc { @@ -83,7 +105,7 @@ compatible = "arm,cortex-a9-twd-timer"; reg = <0xad0600 0x20>; interrupts = ; - clocks = <&sysclk>; + clocks = <&twdclk>; }; apb at e80000 { -- 1.8.3.2