devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Boris BREZILLON <brezillonboris@gmail.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>,
	Mike Turquette <mturquette@linaro.org>,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	Jean-Jacques Hiblot <jjhiblot@traphandler.com>
Cc: devicetree@vger.kernel.org,
	Boris BREZILLON <b.brezillon.dev@gmail.com>,
	linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	Boris BREZILLON <b.brezillon@overkiz.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/11] ARM: at91/dt: move sama5d3 SoC to the new main/slow clk model
Date: Tue, 18 Mar 2014 21:18:38 +0100	[thread overview]
Message-ID: <1395173924-3648-6-git-send-email-b.brezillon.dev@gmail.com> (raw)
In-Reply-To: <1395173924-3648-1-git-send-email-b.brezillon.dev@gmail.com>

Replace the old main and clk definitions (fixed rate clk) by the new main and
slow clk subtree definition (ck = mux(rc_osc, osc)).

Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
---
 arch/arm/boot/dts/sama5d3.dtsi |   61 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 3d5faf8..015797d 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -59,6 +59,18 @@
 	};
 
 	clocks {
+		slow_xtal: slow_xtal {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <0>;
+		};
+
+		main_xtal: main_xtal {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <0>;
+		};
+
 		adc_op_clk: adc_op_clk{
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
@@ -760,18 +772,29 @@
 				#size-cells = <0>;
 				#interrupt-cells = <1>;
 
-				clk32k: slck {
-					compatible = "fixed-clock";
+				main_rc_osc: main_rc_osc {
+					compatible = "atmel,at91sam9x5-clk-main-rc-osc";
 					#clock-cells = <0>;
-					clock-frequency = <32768>;
+					interrupt-parent = <&pmc>;
+					interrupts = <AT91_PMC_MOSCRCS>;
+					clock-frequency = <12000000>;
+					clock-accuracy = <50000000>;
 				};
 
-				main: mainck {
-					compatible = "atmel,at91rm9200-clk-main";
+				main_osc: main_osc {
+					compatible = "atmel,at91rm9200-clk-main-osc";
 					#clock-cells = <0>;
 					interrupt-parent = <&pmc>;
 					interrupts = <AT91_PMC_MOSCS>;
-					clocks = <&clk32k>;
+					clocks = <&main_xtal>;
+				};
+
+				main: mainck {
+					compatible = "atmel,at91sam9x5-clk-main";
+					#clock-cells = <0>;
+					interrupt-parent = <&pmc>;
+					interrupts = <AT91_PMC_MOSCSELS>;
+					clocks = <&main_rc_osc &main_osc>;
 				};
 
 				plla: pllack {
@@ -1100,6 +1123,32 @@
 				status = "disabled";
 			};
 
+			sckc@fffffe50 {
+				compatible = "atmel,at91sam9x5-sckc";
+				reg = <0xfffffe50 0x4>;
+
+				slow_rc_osc: slow_rc_osc {
+					compatible = "atmel,at91sam9x5-clk-slow-rc-osc";
+					#clock-cells = <0>;
+					clock-frequency = <32768>;
+					clock-accuracy = <50000000>;
+					atmel,startup-time-usec = <75>;
+				};
+
+				slow_osc: slow_osc {
+					compatible = "atmel,at91sam9x5-clk-slow-osc";
+					#clock-cells = <0>;
+					clocks = <&slow_xtal>;
+					atmel,startup-time-usec = <1200000>;
+				};
+
+				clk32k: slowck {
+					compatible = "atmel,at91sam9x5-clk-slow";
+					#clock-cells = <0>;
+					clocks = <&slow_rc_osc &slow_osc>;
+				};
+			};
+
 			rtc@fffffeb0 {
 				compatible = "atmel,at91rm9200-rtc";
 				reg = <0xfffffeb0 0x30>;
-- 
1.7.9.5

  parent reply	other threads:[~2014-03-18 20:18 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-18 20:18 [PATCH 00/11] ARM: at91: rework main and slow clk implementation Boris BREZILLON
2014-03-18 20:18 ` [PATCH 01/11] clk: at91: rework main " Boris BREZILLON
2014-03-18 20:18 ` [PATCH 02/11] clk: at91: update main clk documentation Boris BREZILLON
2014-03-18 20:18 ` [PATCH 03/11] clk: at91: add slow clks driver Boris BREZILLON
2014-03-18 20:18 ` [PATCH 04/11] clk: at91: add slow clk documentation Boris BREZILLON
2014-03-18 20:18 ` Boris BREZILLON [this message]
2014-03-18 20:18 ` [PATCH 06/11] ARM: at91/dt: add xtal frequencies to sama5d3xcm boards Boris BREZILLON
2014-03-18 20:18 ` [PATCH 07/11] ARM: at91/dt: add xtal frequencies to sama5d3 xplained board Boris BREZILLON
2014-03-18 20:18 ` [PATCH 08/11] ARM: at91/dt: move at91sam9261 SoC to the new main clock model Boris BREZILLON
     [not found]   ` <1395173924-3648-9-git-send-email-b.brezillon.dev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-03-20  9:22     ` Jean-Jacques Hiblot
2014-03-18 20:18 ` [PATCH 09/11] ARM: at91/dt: define main xtal frequency of the at91sam9261ek board Boris BREZILLON
2014-03-20  9:24   ` Jean-Jacques Hiblot
2014-03-20  9:50     ` Boris BREZILLON
2014-03-20 10:09       ` Jean-Jacques Hiblot
2014-03-18 20:18 ` [PATCH 10/11] ARM: at91/dt: move at91sam9rl SoC to the new slow/main clock models Boris BREZILLON
     [not found]   ` <1395173924-3648-11-git-send-email-b.brezillon.dev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-03-19 15:39     ` Alexandre Belloni
2014-03-18 20:18 ` [PATCH 11/11] ARM: at91/dt: define sam9rlek crystal frequencies Boris BREZILLON
2014-03-19 15:40   ` Alexandre Belloni
2014-03-19  8:19 ` [PATCH 00/11] ARM: at91: rework main and slow clk implementation Jean-Jacques Hiblot
     [not found] ` <3485B87A-1832-4EE3-8613-B5165C282397@jcrosoft.com>
2014-03-19  9:48   ` Boris BREZILLON

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=1395173924-3648-6-git-send-email-b.brezillon.dev@gmail.com \
    --to=brezillonboris@gmail.com \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=b.brezillon.dev@gmail.com \
    --cc=b.brezillon@overkiz.com \
    --cc=devicetree@vger.kernel.org \
    --cc=jjhiblot@traphandler.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mturquette@linaro.org \
    --cc=nicolas.ferre@atmel.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).