From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
devicetree@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
Date: Thu, 22 May 2014 14:33:16 +0200 [thread overview]
Message-ID: <1400761997-13512-2-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1400761997-13512-1-git-send-email-geert+renesas@glider.be>
Warning (ranges_format): /clocks has empty "ranges" property but its #address-cells (2) differs from / (1)
Warning (ranges_format): /clocks has empty "ranges" property but its #size-cells (2) differs from / (1)
As r8a7779 doesn't support LPAE, change #address-cells and #size-cells from
"<2>" to "<1>" to fix this.
Also correct the unit-address for the cpg_clocks node, and add missing
unit-addresses for the mstp*_clks nodes.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Is it correct that r8a7779 doesn't support LPAE? I don't have the datasheet,
but the similar r8a7778 doesn't.
arch/arm/boot/dts/r8a7779.dtsi | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 038c16a18373..dc624e0d7506 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -284,8 +284,8 @@
};
clocks {
- #address-cells = <2>;
- #size-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <1>;
ranges;
/* External root clock */
@@ -298,9 +298,9 @@
};
/* Special CPG clocks */
- cpg_clocks: cpg_clocks@0xe6150000 {
+ cpg_clocks: cpg_clocks@0xffc80000 {
compatible = "renesas,r8a7779-cpg-clocks";
- reg = <0 0xffc80000 0 0x30>;
+ reg = <0xffc80000 0x30>;
clocks = <&extal_clk>;
#clock-cells = <1>;
clock-output-names = "plla", "z", "zs", "s",
@@ -342,10 +342,10 @@
};
/* Gate clocks */
- mstp0_clks: mstp0_clks {
+ mstp0_clks: mstp0_clks@ffc80030 {
compatible = "renesas,r8a7779-mstp-clocks",
"renesas,cpg-mstp-clocks";
- reg = <0 0xffc80030 0 4>;
+ reg = <0xffc80030 4>;
clocks = <&cpg_clocks R8A7779_CLK_S>,
<&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_P>,
@@ -379,10 +379,10 @@
"scif1", "scif0", "i2c3", "i2c2", "i2c1",
"i2c0";
};
- mstp1_clks: mstp1_clks {
+ mstp1_clks: mstp1_clks@ffc80034 {
compatible = "renesas,r8a7779-mstp-clocks",
"renesas,cpg-mstp-clocks";
- reg = <0 0xffc80034 0 4>, <0 0xffc80044 0 4>;
+ reg = <0xffc80034 4>, <0xffc80044 4>;
clocks = <&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_S>,
@@ -408,10 +408,10 @@
"ether", "sata",
"pcie", "vin3";
};
- mstp3_clks: mstp3_clks {
+ mstp3_clks: mstp3_clks@ffc8003c {
compatible = "renesas,r8a7779-mstp-clocks",
"renesas,cpg-mstp-clocks";
- reg = <0 0xffc8003c 0 4>;
+ reg = <0xffc8003c 4>;
clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>,
<&s4_clk>, <&s4_clk>;
#clock-cells = <1>;
--
1.9.1
next prev parent reply other threads:[~2014-05-22 12:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-22 12:33 [PATCH 0/2] ARM: shmobile: r8a7779/marzen CCF DT updates Geert Uytterhoeven
2014-05-22 12:33 ` Geert Uytterhoeven [this message]
2014-05-22 23:08 ` [PATCH 1/2] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks Laurent Pinchart
2014-05-23 6:55 ` Geert Uytterhoeven
[not found] ` <1400761997-13512-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
2014-05-22 12:33 ` [PATCH 2/2] ARM: shmobile: marzen dts: Remove superfluous include Geert Uytterhoeven
2014-05-22 12:50 ` Laurent Pinchart
2014-05-22 12:58 ` Geert Uytterhoeven
2014-05-23 0:51 ` Simon Horman
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=1400761997-13512-2-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=devicetree@vger.kernel.org \
--cc=horms@verge.net.au \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@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).