From: Paul Cercueil <paul@crapouillou.net>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Rob Herring <robh+dt@kernel.org>
Cc: od@zcrc.me, 周琰杰 <zhouyanjie@wanyeetech.com>,
devicetree@vger.kernel.org, linux-mips@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Paul Cercueil" <paul@crapouillou.net>
Subject: [PATCH 07/13] MIPS: ingenic: DTS: Respect cell count of common properties
Date: Mon, 13 Apr 2020 17:26:27 +0200 [thread overview]
Message-ID: <20200413152633.198301-7-paul@crapouillou.net> (raw)
In-Reply-To: <20200413152633.198301-1-paul@crapouillou.net>
If N fields of X cells should be provided, then that's what the
devicetree should represent, instead of having one single field of
(N*X) cells.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
arch/mips/boot/dts/ingenic/jz4740.dtsi | 19 +++++++++----------
arch/mips/boot/dts/ingenic/jz4770.dtsi | 12 +++++-------
arch/mips/boot/dts/ingenic/jz4780.dtsi | 24 +++++++++++-------------
arch/mips/boot/dts/ingenic/x1000.dtsi | 9 ++++-----
4 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi
index a3301bab9231..b56671157bbd 100644
--- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
@@ -55,10 +55,10 @@ tcu: timer@10002000 {
#clock-cells = <1>;
- clocks = <&cgu JZ4740_CLK_RTC
- &cgu JZ4740_CLK_EXT
- &cgu JZ4740_CLK_PCLK
- &cgu JZ4740_CLK_TCU>;
+ clocks = <&cgu JZ4740_CLK_RTC>,
+ <&cgu JZ4740_CLK_EXT>,
+ <&cgu JZ4740_CLK_PCLK>,
+ <&cgu JZ4740_CLK_TCU>;
clock-names = "rtc", "ext", "pclk", "tcu";
interrupt-controller;
@@ -241,10 +241,10 @@ nemc: memory-controller@13010000 {
reg = <0x13010000 0x54>;
#address-cells = <2>;
#size-cells = <1>;
- ranges = <1 0 0x18000000 0x4000000
- 2 0 0x14000000 0x4000000
- 3 0 0x0c000000 0x4000000
- 4 0 0x08000000 0x4000000>;
+ ranges = <1 0 0x18000000 0x4000000>,
+ <2 0 0x14000000 0x4000000>,
+ <3 0 0x0c000000 0x4000000>,
+ <4 0 0x08000000 0x4000000>;
clocks = <&cgu JZ4740_CLK_MCLK>;
};
@@ -258,8 +258,7 @@ ecc: ecc-controller@13010100 {
dmac: dma-controller@13020000 {
compatible = "ingenic,jz4740-dma";
- reg = <0x13020000 0xbc
- 0x13020300 0x14>;
+ reg = <0x13020000 0xbc>, <0x13020300 0x14>;
#dma-cells = <2>;
interrupt-parent = <&intc>;
diff --git a/arch/mips/boot/dts/ingenic/jz4770.dtsi b/arch/mips/boot/dts/ingenic/jz4770.dtsi
index 3805816cea2e..9a25a6f7a48d 100644
--- a/arch/mips/boot/dts/ingenic/jz4770.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4770.dtsi
@@ -55,9 +55,9 @@ tcu: timer@10002000 {
#clock-cells = <1>;
- clocks = <&cgu JZ4770_CLK_RTC
- &cgu JZ4770_CLK_EXT
- &cgu JZ4770_CLK_PCLK>;
+ clocks = <&cgu JZ4770_CLK_RTC>,
+ <&cgu JZ4770_CLK_EXT>,
+ <&cgu JZ4770_CLK_PCLK>;
clock-names = "rtc", "ext", "pclk";
interrupt-controller;
@@ -219,8 +219,7 @@ uart3: serial@10033000 {
dmac0: dma-controller@13420000 {
compatible = "ingenic,jz4770-dma";
- reg = <0x13420000 0xC0
- 0x13420300 0x20>;
+ reg = <0x13420000 0xC0>, <0x13420300 0x20>;
#dma-cells = <2>;
@@ -234,8 +233,7 @@ dmac0: dma-controller@13420000 {
dmac1: dma-controller@13420100 {
compatible = "ingenic,jz4770-dma";
- reg = <0x13420100 0xC0
- 0x13420400 0x20>;
+ reg = <0x13420100 0xC0>, <0x13420400 0x20>;
#dma-cells = <2>;
diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi
index bb89653d16a3..51ea764101aa 100644
--- a/arch/mips/boot/dts/ingenic/jz4780.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi
@@ -58,9 +58,9 @@ tcu: timer@10002000 {
#clock-cells = <1>;
- clocks = <&cgu JZ4780_CLK_RTCLK
- &cgu JZ4780_CLK_EXCLK
- &cgu JZ4780_CLK_PCLK>;
+ clocks = <&cgu JZ4780_CLK_RTCLK>,
+ <&cgu JZ4780_CLK_EXCLK>,
+ <&cgu JZ4780_CLK_PCLK>;
clock-names = "rtc", "ext", "pclk";
interrupt-controller;
@@ -196,8 +196,7 @@ spi_gpio {
gpio-miso = <&gpe 14 0>;
gpio-sck = <&gpe 15 0>;
gpio-mosi = <&gpe 17 0>;
- cs-gpios = <&gpe 16 0
- &gpe 18 0>;
+ cs-gpios = <&gpe 16 0>, <&gpe 18 0>;
spidev@0 {
compatible = "spidev";
@@ -362,12 +361,12 @@ nemc: nemc@13410000 {
reg = <0x13410000 0x10000>;
#address-cells = <2>;
#size-cells = <1>;
- ranges = <1 0 0x1b000000 0x1000000
- 2 0 0x1a000000 0x1000000
- 3 0 0x19000000 0x1000000
- 4 0 0x18000000 0x1000000
- 5 0 0x17000000 0x1000000
- 6 0 0x16000000 0x1000000>;
+ ranges = <1 0 0x1b000000 0x1000000>,
+ <2 0 0x1a000000 0x1000000>,
+ <3 0 0x19000000 0x1000000>,
+ <4 0 0x18000000 0x1000000>,
+ <5 0 0x17000000 0x1000000>,
+ <6 0 0x16000000 0x1000000>;
clocks = <&cgu JZ4780_CLK_NEMC>;
@@ -376,8 +375,7 @@ nemc: nemc@13410000 {
dma: dma@13420000 {
compatible = "ingenic,jz4780-dma";
- reg = <0x13420000 0x400
- 0x13421000 0x40>;
+ reg = <0x13420000 0x400>, <0x13421000 0x40>;
#dma-cells = <2>;
interrupt-parent = <&intc>;
diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi b/arch/mips/boot/dts/ingenic/x1000.dtsi
index 147f7d5c243a..59a63a0985a8 100644
--- a/arch/mips/boot/dts/ingenic/x1000.dtsi
+++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
@@ -58,9 +58,9 @@ tcu: timer@10002000 {
#clock-cells = <1>;
- clocks = <&cgu X1000_CLK_RTCLK
- &cgu X1000_CLK_EXCLK
- &cgu X1000_CLK_PCLK>;
+ clocks = <&cgu X1000_CLK_RTCLK>,
+ <&cgu X1000_CLK_EXCLK>,
+ <&cgu X1000_CLK_PCLK>;
clock-names = "rtc", "ext", "pclk";
interrupt-controller;
@@ -239,8 +239,7 @@ uart2: serial@10032000 {
pdma: dma-controller@13420000 {
compatible = "ingenic,x1000-dma";
- reg = <0x13420000 0x400
- 0x13421000 0x40>;
+ reg = <0x13420000 0x400>, <0x13421000 0x40>;
#dma-cells = <2>;
interrupt-parent = <&intc>;
--
2.25.1
next prev parent reply other threads:[~2020-04-13 15:28 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-13 15:26 [PATCH 01/13] dt-bindings: timer: Convert ingenic,tcu.txt to YAML Paul Cercueil
2020-04-13 15:26 ` [PATCH 02/13] dt-bindings: mmc: Convert jz4740-mmc doc " Paul Cercueil
2020-04-20 20:48 ` Rob Herring
2020-04-13 15:26 ` [PATCH 03/13] dt-bindings: dma: Convert jz4740-dma " Paul Cercueil
2020-04-20 20:49 ` Rob Herring
2020-04-13 15:26 ` [PATCH 04/13] dt-bindings: usb: ingenic,musb: Add usb-role-switch property Paul Cercueil
2020-04-20 20:49 ` Rob Herring
2020-04-13 15:26 ` [PATCH 05/13] dt-bindings: MIPS: Require SoC compatible string after board string Paul Cercueil
2020-04-20 20:50 ` Rob Herring
2020-04-13 15:26 ` [PATCH 06/13] MIPS: ingenic: DTS: Fix invalid value in #dma-cells Paul Cercueil
2020-04-13 15:26 ` Paul Cercueil [this message]
2020-04-29 21:04 ` [PATCH 07/13] MIPS: ingenic: DTS: Respect cell count of common properties Thomas Bogendoerfer
2020-04-30 12:17 ` Paul Cercueil
2020-04-13 15:26 ` [PATCH 08/13] MIPS: ingenic: DTS: Add nodes for the watchdog/PWM/OST Paul Cercueil
2020-04-29 21:04 ` Thomas Bogendoerfer
2020-04-13 15:26 ` [PATCH 09/13] MIPS: ingenic: DTS: Update JZ4770 support Paul Cercueil
2020-04-29 21:05 ` Thomas Bogendoerfer
2020-04-13 15:26 ` [PATCH 10/13] MIPS: ingenic: DTS: Update GCW0 support Paul Cercueil
2020-04-29 21:05 ` Thomas Bogendoerfer
2020-04-13 15:26 ` [PATCH 11/13] MIPS: ingenic: CI20: enable OST, PWM drivers in defconfig Paul Cercueil
2020-04-29 21:05 ` Thomas Bogendoerfer
2020-04-13 15:26 ` [PATCH 12/13] MIPS: ingenic: GCW0: Update defconfig Paul Cercueil
2020-04-29 21:06 ` Thomas Bogendoerfer
2020-04-13 15:26 ` [PATCH 13/13] MIPS: ingenic: Drop obsolete code, merge the rest in setup.c Paul Cercueil
2020-04-29 21:06 ` Thomas Bogendoerfer
2020-04-20 20:47 ` [PATCH 01/13] dt-bindings: timer: Convert ingenic,tcu.txt to YAML Rob Herring
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=20200413152633.198301-7-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=od@zcrc.me \
--cc=robh+dt@kernel.org \
--cc=tsbogend@alpha.franken.de \
--cc=zhouyanjie@wanyeetech.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
all inboxes | Powered by JetHome®