From: Conor Dooley <conor@kernel.org>
To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Thierry Reding <thierry.reding@gmail.com>,
Sam Ravnborg <sam@ravnborg.org>,
Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>,
Vinod Koul <vkoul@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Serge Semin <fancer.lancer@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
Palmer Dabbelt <palmer@rivosinc.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Conor Dooley <conor.dooley@microchip.com>,
Masahiro Yamada <masahiroy@kernel.org>,
Damien Le Moal <damien.lemoal@opensource.wdc.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Niklas Cassel <niklas.cassel@wdc.com>,
Dillon Min <dillon.minfei@gmail.com>,
Jose Abreu <joabreu@synopsys.com>,
dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org,
alsa-devel@alsa-project.org, linux-riscv@lists.infradead.org
Subject: [PATCH v4 07/14] riscv: dts: canaan: fix the k210's timer nodes
Date: Fri, 1 Jul 2022 20:22:53 +0100 [thread overview]
Message-ID: <20220701192300.2293643-8-conor@kernel.org> (raw)
In-Reply-To: <20220701192300.2293643-1-conor@kernel.org>
From: Conor Dooley <conor.dooley@microchip.com>
The timers on the k210 have non standard interrupt configurations,
which leads to dtbs_check warnings:
k210_generic.dtb: timer@502d0000: interrupts: [[14], [15]] is too long
From schema: Documentation/devicetree/bindings/timer/snps,dw-apb-timer.yaml
Split the timer nodes in two, so that the second timer in the IP block
can actually be accessed & in the process solve the dtbs_check warning.
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
arch/riscv/boot/dts/canaan/k210.dtsi | 46 +++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 8 deletions(-)
diff --git a/arch/riscv/boot/dts/canaan/k210.dtsi b/arch/riscv/boot/dts/canaan/k210.dtsi
index cd4eae82d8b2..72f70128d751 100644
--- a/arch/riscv/boot/dts/canaan/k210.dtsi
+++ b/arch/riscv/boot/dts/canaan/k210.dtsi
@@ -319,28 +319,58 @@ fpioa: pinmux@502b0000 {
timer0: timer@502d0000 {
compatible = "snps,dw-apb-timer";
- reg = <0x502D0000 0x100>;
- interrupts = <14>, <15>;
+ reg = <0x502D0000 0x14>;
+ interrupts = <14>;
clocks = <&sysclk K210_CLK_TIMER0>,
<&sysclk K210_CLK_APB0>;
clock-names = "timer", "pclk";
resets = <&sysrst K210_RST_TIMER0>;
};
- timer1: timer@502e0000 {
+ timer1: timer@502d0014 {
compatible = "snps,dw-apb-timer";
- reg = <0x502E0000 0x100>;
- interrupts = <16>, <17>;
+ reg = <0x502D0014 0x14>;
+ interrupts = <15>;
+ clocks = <&sysclk K210_CLK_TIMER0>,
+ <&sysclk K210_CLK_APB0>;
+ clock-names = "timer", "pclk";
+ resets = <&sysrst K210_RST_TIMER0>;
+ };
+
+ timer2: timer@502e0000 {
+ compatible = "snps,dw-apb-timer";
+ reg = <0x502E0000 0x14>;
+ interrupts = <16>;
clocks = <&sysclk K210_CLK_TIMER1>,
<&sysclk K210_CLK_APB0>;
clock-names = "timer", "pclk";
resets = <&sysrst K210_RST_TIMER1>;
};
- timer2: timer@502f0000 {
+ timer3: timer@502e0014 {
+ compatible = "snps,dw-apb-timer";
+ reg = <0x502E0014 0x114>;
+ interrupts = <17>;
+ clocks = <&sysclk K210_CLK_TIMER1>,
+ <&sysclk K210_CLK_APB0>;
+ clock-names = "timer", "pclk";
+ resets = <&sysrst K210_RST_TIMER1>;
+ };
+
+ timer4: timer@502f0000 {
+ compatible = "snps,dw-apb-timer";
+ reg = <0x502F0000 0x14>;
+ interrupts = <18>;
+ clocks = <&sysclk K210_CLK_TIMER2>,
+ <&sysclk K210_CLK_APB0>;
+ clock-names = "timer", "pclk";
+ resets = <&sysrst K210_RST_TIMER2>;
+ };
+
+ timer5: timer@502f0014 {
compatible = "snps,dw-apb-timer";
- reg = <0x502F0000 0x100>;
- interrupts = <18>, <19>;
+ reg = <0x502F0014 0x14>;
+ interrupts = <19>;
clocks = <&sysclk K210_CLK_TIMER2>,
<&sysclk K210_CLK_APB0>;
clock-names = "timer", "pclk";
--
2.37.0
next prev parent reply other threads:[~2022-07-01 19:24 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 19:22 [PATCH v4 00/14] Canaan devicetree fixes Conor Dooley
2022-07-01 19:22 ` [PATCH v4 01/14] dt-bindings: display: convert ilitek,ili9341.txt to dt-schema Conor Dooley
2022-07-01 19:22 ` [PATCH v4 02/14] dt-bindings: display: ili9341: document canaan kd233's lcd Conor Dooley
2022-07-05 19:04 ` Rob Herring
2022-07-01 19:22 ` [PATCH v4 03/14] ASoC: dt-bindings: convert designware-i2s to dt-schema Conor Dooley
2022-07-01 19:22 ` [PATCH v4 04/14] dt-bindings: dma: dw-axi-dmac: extend the number of interrupts Conor Dooley
2022-07-05 12:46 ` Vinod Koul
2022-07-05 12:50 ` Conor.Dooley
2022-07-01 19:22 ` [PATCH v4 05/14] dt-bindings: memory-controllers: add canaan k210 sram controller Conor Dooley
2022-07-05 19:23 ` Rob Herring
2022-07-05 19:28 ` Conor.Dooley
2022-07-05 19:31 ` Conor.Dooley
2022-07-01 19:22 ` [PATCH v4 06/14] riscv: dts: canaan: fix the k210's memory node Conor Dooley
2022-07-01 19:22 ` Conor Dooley [this message]
2022-07-01 19:22 ` [PATCH v4 08/14] riscv: dts: canaan: fix mmc node names Conor Dooley
2022-07-01 19:22 ` [PATCH v4 09/14] riscv: dts: canaan: fix kd233 display spi frequency Conor Dooley
2022-07-01 19:22 ` [PATCH v4 10/14] riscv: dts: canaan: use custom compatible for k210 i2s Conor Dooley
2022-07-01 19:22 ` [PATCH v4 11/14] riscv: dts: canaan: remove spi-max-frequency from controllers Conor Dooley
2022-07-01 19:22 ` [PATCH v4 12/14] riscv: dts: canaan: fix bus {ranges,reg} warnings Conor Dooley
2022-07-01 19:22 ` [PATCH v4 13/14] riscv: dts: canaan: add specific compatible for kd233's LCD Conor Dooley
2022-07-01 19:23 ` [PATCH v4 14/14] riscv: dts: canaan: build all devicetress if SOC_CANAAN Conor Dooley
2022-07-04 15:57 ` (subset) [PATCH v4 00/14] Canaan devicetree fixes Mark Brown
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=20220701192300.2293643-8-conor@kernel.org \
--to=conor@kernel.org \
--cc=Eugeniy.Paltsev@synopsys.com \
--cc=airlied@linux.ie \
--cc=alsa-devel@alsa-project.org \
--cc=aou@eecs.berkeley.edu \
--cc=broonie@kernel.org \
--cc=conor.dooley@microchip.com \
--cc=damien.lemoal@opensource.wdc.com \
--cc=daniel.lezcano@linaro.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dillon.minfei@gmail.com \
--cc=dmaengine@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=fancer.lancer@gmail.com \
--cc=geert@linux-m68k.org \
--cc=joabreu@synopsys.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=masahiroy@kernel.org \
--cc=niklas.cassel@wdc.com \
--cc=palmer@dabbelt.com \
--cc=palmer@rivosinc.com \
--cc=paul.walmsley@sifive.com \
--cc=robh+dt@kernel.org \
--cc=sam@ravnborg.org \
--cc=thierry.reding@gmail.com \
--cc=vkoul@kernel.org \
/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).