From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Mike Turquette <mturquette@linaro.org>,
Jisheng Zhang <jszhang@marvell.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 09/10] ARM: dts: berlin: convert BG2 to DT clock nodes
Date: Mon, 19 May 2014 23:13:33 +0200 [thread overview]
Message-ID: <20140519211333.GS29318@piout.net> (raw)
In-Reply-To: <1400517811-24668-10-git-send-email-sebastian.hesselbarth@gmail.com>
On 19/05/2014 at 18:43:30 +0200, Sebastian Hesselbarth wrote :
> This converts Berlin BG2 SoC dtsi to make use of the new DT clock
> nodes for Berlin SoCs. While at it, also fix up twdclk which is
> running at cpuclk/3 instead of sysclk.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> Changelog:
> v1->v2:
> - adapt to new single chip control node and compatible
>
> Cc: Mike Turquette <mturquette@linaro.org>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Jisheng Zhang <jszhang@marvell.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
> arch/arm/boot/dts/berlin2.dtsi | 56 +++++++++++++++++-------------------------
> 1 file changed, 23 insertions(+), 33 deletions(-)
>
> diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi
> index 57cadd31f4e1..591d4b8c1c2b 100644
> --- a/arch/arm/boot/dts/berlin2.dtsi
> +++ b/arch/arm/boot/dts/berlin2.dtsi
> @@ -12,6 +12,7 @@
> */
>
> #include "skeleton.dtsi"
> +#include <dt-bindings/clock/berlin2.h>
> #include <dt-bindings/interrupt-controller/arm-gic.h>
>
> / {
> @@ -37,24 +38,10 @@
> };
> };
>
> - clocks {
> - smclk: sysmgr-clock {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <25000000>;
> - };
> -
> - cfgclk: cfg-clock {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <100000000>;
> - };
> -
> - sysclk: system-clock {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <400000000>;
> - };
> + refclk: oscillator {
> + compatible = "fixed-clock";
> + #clock-cells = <0>;
> + clock-frequency = <25000000>;
> };
>
> soc {
> @@ -88,7 +75,7 @@
> compatible = "arm,cortex-a9-twd-timer";
> reg = <0xad0600 0x20>;
> interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&sysclk>;
> + clocks = <&chip CLKID_TWD>;
> };
>
> apb@e80000 {
> @@ -175,7 +162,7 @@
> compatible = "snps,dw-apb-timer";
> reg = <0x2c00 0x14>;
> interrupts = <8>;
> - clocks = <&cfgclk>;
> + clocks = <&chip CLKID_CFG>;
> clock-names = "timer";
> status = "okay";
> };
> @@ -184,7 +171,7 @@
> compatible = "snps,dw-apb-timer";
> reg = <0x2c14 0x14>;
> interrupts = <9>;
> - clocks = <&cfgclk>;
> + clocks = <&chip CLKID_CFG>;
> clock-names = "timer";
> status = "okay";
> };
> @@ -193,7 +180,7 @@
> compatible = "snps,dw-apb-timer";
> reg = <0x2c28 0x14>;
> interrupts = <10>;
> - clocks = <&cfgclk>;
> + clocks = <&chip CLKID_CFG>;
> clock-names = "timer";
> status = "disabled";
> };
> @@ -202,7 +189,7 @@
> compatible = "snps,dw-apb-timer";
> reg = <0x2c3c 0x14>;
> interrupts = <11>;
> - clocks = <&cfgclk>;
> + clocks = <&chip CLKID_CFG>;
> clock-names = "timer";
> status = "disabled";
> };
> @@ -211,7 +198,7 @@
> compatible = "snps,dw-apb-timer";
> reg = <0x2c50 0x14>;
> interrupts = <12>;
> - clocks = <&cfgclk>;
> + clocks = <&chip CLKID_CFG>;
> clock-names = "timer";
> status = "disabled";
> };
> @@ -220,7 +207,7 @@
> compatible = "snps,dw-apb-timer";
> reg = <0x2c64 0x14>;
> interrupts = <13>;
> - clocks = <&cfgclk>;
> + clocks = <&chip CLKID_CFG>;
> clock-names = "timer";
> status = "disabled";
> };
> @@ -229,7 +216,7 @@
> compatible = "snps,dw-apb-timer";
> reg = <0x2c78 0x14>;
> interrupts = <14>;
> - clocks = <&cfgclk>;
> + clocks = <&chip CLKID_CFG>;
> clock-names = "timer";
> status = "disabled";
> };
> @@ -238,7 +225,7 @@
> compatible = "snps,dw-apb-timer";
> reg = <0x2c8c 0x14>;
> interrupts = <15>;
> - clocks = <&cfgclk>;
> + clocks = <&chip CLKID_CFG>;
> clock-names = "timer";
> status = "disabled";
> };
> @@ -253,9 +240,12 @@
> };
> };
>
> - generic-regs@ea0184 {
> - compatible = "marvell,berlin-generic-regs", "syscon";
> - reg = <0xea0184 0x10>;
> + chip: chip-control@ea0000 {
> + compatible = "marvell,berlin2-chip-ctrl";
> + #clock-cells = <1>;
> + reg = <0xea0000 0x400>;
> + clocks = <&refclk>;
> + clock-names = "refclk";
> };
>
> apb@fc0000 {
> @@ -305,7 +295,7 @@
> reg-shift = <2>;
> reg-io-width = <1>;
> interrupts = <8>;
> - clocks = <&smclk>;
> + clocks = <&refclk>;
> status = "disabled";
> };
>
> @@ -315,7 +305,7 @@
> reg-shift = <2>;
> reg-io-width = <1>;
> interrupts = <9>;
> - clocks = <&smclk>;
> + clocks = <&refclk>;
> status = "disabled";
> };
>
> @@ -325,7 +315,7 @@
> reg-shift = <2>;
> reg-io-width = <1>;
> interrupts = <10>;
> - clocks = <&smclk>;
> + clocks = <&refclk>;
> status = "disabled";
> };
>
> --
> 1.9.1
>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
next prev parent reply other threads:[~2014-05-19 21:14 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-19 16:43 [PATCH v2 00/10] Marvell Berlin full clock support Sebastian Hesselbarth
2014-05-19 16:43 ` [PATCH v2 01/10] dt-binding: ARM: add clock binding docs for Marvell Berlin2 SoCs Sebastian Hesselbarth
2014-05-19 21:05 ` Alexandre Belloni
2014-05-19 16:43 ` [PATCH v2 02/10] clk: berlin: add binding include for Berlin SoC clock ids Sebastian Hesselbarth
2014-05-19 16:43 ` [PATCH v2 03/10] clk: berlin: add driver for BG2x audio/video PLL Sebastian Hesselbarth
2014-05-19 16:43 ` [PATCH v2 04/10] clk: berlin: add driver for BG2x simple PLLs Sebastian Hesselbarth
2014-05-19 16:43 ` [PATCH v2 05/10] clk: berlin: add driver for BG2x complex divider cells Sebastian Hesselbarth
2014-05-19 16:43 ` [PATCH v2 06/10] clk: berlin: add core clock driver for BG2/BG2CD Sebastian Hesselbarth
2014-05-19 21:06 ` Alexandre Belloni
2014-05-19 16:43 ` [PATCH v2 07/10] clk: berlin: add core clock driver for BG2Q Sebastian Hesselbarth
2014-05-19 16:43 ` [PATCH v2 08/10] ARM: dts: berlin: convert BG2CD to DT clock nodes Sebastian Hesselbarth
2014-05-19 21:07 ` Alexandre Belloni
2014-05-19 16:43 ` [PATCH v2 09/10] ARM: dts: berlin: convert BG2 " Sebastian Hesselbarth
2014-05-19 21:13 ` Alexandre Belloni [this message]
2014-05-19 16:43 ` [PATCH v2 10/10] ARM: dts: berlin: convert BG2Q " Sebastian Hesselbarth
2014-05-19 19:46 ` [PATCH v2 00/10] Marvell Berlin full clock support Sebastian Hesselbarth
2014-05-29 0:07 ` Mike Turquette
2014-05-29 9:20 ` Sebastian Hesselbarth
-- strict thread matches above, loose matches on Subject: below --
2014-05-11 20:24 [PATCH 0/8] " Sebastian Hesselbarth
2014-05-14 20:15 ` [PATCH v2 00/10] " Sebastian Hesselbarth
2014-05-14 20:15 ` [PATCH v2 09/10] ARM: dts: berlin: convert BG2 to DT clock nodes Sebastian Hesselbarth
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=20140519211333.GS29318@piout.net \
--to=alexandre.belloni@free-electrons.com \
--cc=jszhang@marvell.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=sebastian.hesselbarth@gmail.com \
/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).